diff options
Diffstat (limited to 'net/ipv6/ip6_gre.c')
-rw-r--r-- | net/ipv6/ip6_gre.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index e27fb78c61f2..e7a440dd5c0d 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c | |||
@@ -498,7 +498,7 @@ static int ip6gre_rcv(struct sk_buff *skb) | |||
498 | &ipv6h->saddr, &ipv6h->daddr, key, | 498 | &ipv6h->saddr, &ipv6h->daddr, key, |
499 | gre_proto); | 499 | gre_proto); |
500 | if (tunnel) { | 500 | if (tunnel) { |
501 | struct pcpu_tstats *tstats; | 501 | struct pcpu_sw_netstats *tstats; |
502 | 502 | ||
503 | if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) | 503 | if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) |
504 | goto drop; | 504 | goto drop; |
@@ -1265,12 +1265,12 @@ static int ip6gre_tunnel_init(struct net_device *dev) | |||
1265 | if (ipv6_addr_any(&tunnel->parms.raddr)) | 1265 | if (ipv6_addr_any(&tunnel->parms.raddr)) |
1266 | dev->header_ops = &ip6gre_header_ops; | 1266 | dev->header_ops = &ip6gre_header_ops; |
1267 | 1267 | ||
1268 | dev->tstats = alloc_percpu(struct pcpu_tstats); | 1268 | dev->tstats = alloc_percpu(struct pcpu_sw_netstats); |
1269 | if (!dev->tstats) | 1269 | if (!dev->tstats) |
1270 | return -ENOMEM; | 1270 | return -ENOMEM; |
1271 | 1271 | ||
1272 | for_each_possible_cpu(i) { | 1272 | for_each_possible_cpu(i) { |
1273 | struct pcpu_tstats *ip6gre_tunnel_stats; | 1273 | struct pcpu_sw_netstats *ip6gre_tunnel_stats; |
1274 | ip6gre_tunnel_stats = per_cpu_ptr(dev->tstats, i); | 1274 | ip6gre_tunnel_stats = per_cpu_ptr(dev->tstats, i); |
1275 | u64_stats_init(&ip6gre_tunnel_stats->syncp); | 1275 | u64_stats_init(&ip6gre_tunnel_stats->syncp); |
1276 | } | 1276 | } |
@@ -1466,12 +1466,12 @@ static int ip6gre_tap_init(struct net_device *dev) | |||
1466 | 1466 | ||
1467 | ip6gre_tnl_link_config(tunnel, 1); | 1467 | ip6gre_tnl_link_config(tunnel, 1); |
1468 | 1468 | ||
1469 | dev->tstats = alloc_percpu(struct pcpu_tstats); | 1469 | dev->tstats = alloc_percpu(struct pcpu_sw_netstats); |
1470 | if (!dev->tstats) | 1470 | if (!dev->tstats) |
1471 | return -ENOMEM; | 1471 | return -ENOMEM; |
1472 | 1472 | ||
1473 | for_each_possible_cpu(i) { | 1473 | for_each_possible_cpu(i) { |
1474 | struct pcpu_tstats *ip6gre_tap_stats; | 1474 | struct pcpu_sw_netstats *ip6gre_tap_stats; |
1475 | ip6gre_tap_stats = per_cpu_ptr(dev->tstats, i); | 1475 | ip6gre_tap_stats = per_cpu_ptr(dev->tstats, i); |
1476 | u64_stats_init(&ip6gre_tap_stats->syncp); | 1476 | u64_stats_init(&ip6gre_tap_stats->syncp); |
1477 | } | 1477 | } |