From 80ac1e2a2aa57b5a317d1aea5a04a9abd060250b Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 21 May 2008 14:16:14 -0700
Subject: [PATCH] --- yaml --- r: 102605 b: refs/heads/master c:
 2f4c02d40c0d59f4efc59801ad1498cb0f8550ea h: refs/heads/master i:   102603:
 07e31d9e711934c1f5abe07f11dddc8ed81dfd50 v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/ipmr.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47b3f5b83702..9bbc5badb941 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eecc107a85a5882e253bd97310d4e96300a2068
+refs/heads/master: 2f4c02d40c0d59f4efc59801ad1498cb0f8550ea
diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
index 11700a4dcd95..65f12005785e 100644
--- a/trunk/net/ipv4/ipmr.c
+++ b/trunk/net/ipv4/ipmr.c
@@ -1230,8 +1230,8 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
 	if (vif->flags & VIFF_TUNNEL) {
 		ip_encap(skb, vif->local, vif->remote);
 		/* FIXME: extra output firewall step used to be here. --RR */
-		((struct ip_tunnel *)netdev_priv(vif->dev))->stat.tx_packets++;
-		((struct ip_tunnel *)netdev_priv(vif->dev))->stat.tx_bytes+=skb->len;
+		vif->dev->stats.tx_packets++;
+		vif->dev->stats.tx_bytes += skb->len;
 	}
 
 	IPCB(skb)->flags |= IPSKB_FORWARDED;