diff --git a/[refs] b/[refs] index 9bbc5badb941..8b68c68ef66b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f4c02d40c0d59f4efc59801ad1498cb0f8550ea +refs/heads/master: f56dd017c32e759bbdc88ee59d3f76235d720788 diff --git a/trunk/include/net/ipip.h b/trunk/include/net/ipip.h index 633ed4def8e3..a85bda64b852 100644 --- a/trunk/include/net/ipip.h +++ b/trunk/include/net/ipip.h @@ -11,7 +11,6 @@ struct ip_tunnel { struct ip_tunnel *next; struct net_device *dev; - struct net_device_stats stat; int recursion; /* Depth of hard_start_xmit recursion */ int err_count; /* Number of arrived ICMP errors */