]> err.no Git - linux-2.6/commitdiff
ipmr: Ipip tunnel uses on-device stats.
authorPavel Emelyanov <xemul@openvz.org>
Wed, 21 May 2008 21:16:14 +0000 (14:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 May 2008 21:16:14 +0000 (14:16 -0700)
The ipmr uses ipip tunnels for its purposes and updates the
tunnels' stats, but the ipip driver is already switched to
use on-device ones.

Actually, this is a part of the patch #4 from this set.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipmr.c

index 11700a4dcd95cb493b44f94336517eb50d4d73bb..65f12005785ed825d472901b0c6489cc692c76b0 100644 (file)
@@ -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;