sit: Use on-device stats instead of private ones.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
50f59cea07
commit
4eecc107a8
|
@ -578,13 +578,13 @@ static int ipip6_rcv(struct sk_buff *skb)
|
|||
|
||||
if ((tunnel->dev->priv_flags & IFF_ISATAP) &&
|
||||
!isatap_chksrc(skb, iph, tunnel)) {
|
||||
tunnel->stat.rx_errors++;
|
||||
tunnel->dev->stats.rx_errors++;
|
||||
read_unlock(&ipip6_lock);
|
||||
kfree_skb(skb);
|
||||
return 0;
|
||||
}
|
||||
tunnel->stat.rx_packets++;
|
||||
tunnel->stat.rx_bytes += skb->len;
|
||||
tunnel->dev->stats.rx_packets++;
|
||||
tunnel->dev->stats.rx_bytes += skb->len;
|
||||
skb->dev = tunnel->dev;
|
||||
dst_release(skb->dst);
|
||||
skb->dst = NULL;
|
||||
|
@ -624,7 +624,7 @@ static inline __be32 try_6to4(struct in6_addr *v6dst)
|
|||
static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct ip_tunnel *tunnel = netdev_priv(dev);
|
||||
struct net_device_stats *stats = &tunnel->stat;
|
||||
struct net_device_stats *stats = &tunnel->dev->stats;
|
||||
struct iphdr *tiph = &tunnel->parms.iph;
|
||||
struct ipv6hdr *iph6 = ipv6_hdr(skb);
|
||||
u8 tos = tunnel->parms.iph.tos;
|
||||
|
@ -638,7 +638,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
int addr_type;
|
||||
|
||||
if (tunnel->recursion++) {
|
||||
tunnel->stat.collisions++;
|
||||
stats->collisions++;
|
||||
goto tx_error;
|
||||
}
|
||||
|
||||
|
@ -705,20 +705,20 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
.oif = tunnel->parms.link,
|
||||
.proto = IPPROTO_IPV6 };
|
||||
if (ip_route_output_key(dev_net(dev), &rt, &fl)) {
|
||||
tunnel->stat.tx_carrier_errors++;
|
||||
stats->tx_carrier_errors++;
|
||||
goto tx_error_icmp;
|
||||
}
|
||||
}
|
||||
if (rt->rt_type != RTN_UNICAST) {
|
||||
ip_rt_put(rt);
|
||||
tunnel->stat.tx_carrier_errors++;
|
||||
stats->tx_carrier_errors++;
|
||||
goto tx_error_icmp;
|
||||
}
|
||||
tdev = rt->u.dst.dev;
|
||||
|
||||
if (tdev == dev) {
|
||||
ip_rt_put(rt);
|
||||
tunnel->stat.collisions++;
|
||||
stats->collisions++;
|
||||
goto tx_error;
|
||||
}
|
||||
|
||||
|
@ -728,7 +728,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
mtu = skb->dst ? dst_mtu(skb->dst) : dev->mtu;
|
||||
|
||||
if (mtu < 68) {
|
||||
tunnel->stat.collisions++;
|
||||
stats->collisions++;
|
||||
ip_rt_put(rt);
|
||||
goto tx_error;
|
||||
}
|
||||
|
@ -1003,11 +1003,6 @@ done:
|
|||
return err;
|
||||
}
|
||||
|
||||
static struct net_device_stats *ipip6_tunnel_get_stats(struct net_device *dev)
|
||||
{
|
||||
return &(((struct ip_tunnel*)netdev_priv(dev))->stat);
|
||||
}
|
||||
|
||||
static int ipip6_tunnel_change_mtu(struct net_device *dev, int new_mtu)
|
||||
{
|
||||
if (new_mtu < IPV6_MIN_MTU || new_mtu > 0xFFF8 - sizeof(struct iphdr))
|
||||
|
@ -1021,7 +1016,6 @@ static void ipip6_tunnel_setup(struct net_device *dev)
|
|||
dev->uninit = ipip6_tunnel_uninit;
|
||||
dev->destructor = free_netdev;
|
||||
dev->hard_start_xmit = ipip6_tunnel_xmit;
|
||||
dev->get_stats = ipip6_tunnel_get_stats;
|
||||
dev->do_ioctl = ipip6_tunnel_ioctl;
|
||||
dev->change_mtu = ipip6_tunnel_change_mtu;
|
||||
|
||||
|
|
Loading…
Reference in a new issue