diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-11-11 22:52:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-15 00:49:50 +0100 |
| commit | aa0010f880ab542da3ad0e72992f2dc518ac68a0 (patch) | |
| tree | fe030d13bb1fcbf6071b268f06c068e2a7a50b0e /net/ipv6/ip6_tunnel.c | |
| parent | ARM: net: bpf_jit_32: add VLAN instructions for BPF JIT (diff) | |
| download | linux-aa0010f880ab542da3ad0e72992f2dc518ac68a0.tar.xz linux-aa0010f880ab542da3ad0e72992f2dc518ac68a0.zip | |
net: convert __IPTUNNEL_XMIT() to an inline function
__IPTUNNEL_XMIT() is an ugly macro, convert it to a static
inline function, so make it more readable.
IPTUNNEL_XMIT() is unused, just remove it.
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 424ed45ef122..8db4d9b7ab14 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -95,14 +95,6 @@ struct ip6_tnl_net { struct ip6_tnl __rcu **tnls[2]; }; -/* often modified stats are per cpu, other are shared (netdev->stats) */ -struct pcpu_tstats { - unsigned long rx_packets; - unsigned long rx_bytes; - unsigned long tx_packets; - unsigned long tx_bytes; -} __attribute__((aligned(4*sizeof(unsigned long)))); - static struct net_device_stats *ip6_get_stats(struct net_device *dev) { struct pcpu_tstats sum = { 0 }; |