Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5e38e270444f2629de7a706b5a9ca1b333d14517

Authored by Pavel Emelyanov
Committed by David S. Miller
1 parent c6f8f7e3bb
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

mib: add net to IP_INC_STATS 

All the callers already have either the net itself, or the place
where to get it from.

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

Showing 4 changed files with 18 additions and 18 deletions Side-by-side Diff

... ... @@ -157,7 +157,7 @@
157 157  
158 158 extern struct ipv4_config ipv4_config;
159 159 DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics);
160   -#define IP_INC_STATS(field) SNMP_INC_STATS(ip_statistics, field)
  160 +#define IP_INC_STATS(net, field) do { (void)net; SNMP_INC_STATS(ip_statistics, field); } while (0)
161 161 #define IP_INC_STATS_BH(field) SNMP_INC_STATS_BH(ip_statistics, field)
162 162 #define IP_ADD_STATS_BH(field, val) SNMP_ADD_STATS_BH(ip_statistics, field, val)
163 163 DECLARE_SNMP_STAT(struct linux_mib, net_statistics);
net/ipv4/ip_forward.c
Diff comments   View file @ 5e38e27
... ... @@ -88,7 +88,7 @@
88 88  
89 89 if (unlikely(skb->len > dst_mtu(&rt->u.dst) && !skb_is_gso(skb) &&
90 90 (ip_hdr(skb)->frag_off & htons(IP_DF))) && !skb->local_df) {
91   - IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
  91 + IP_INC_STATS(dev_net(rt->u.dst.dev), IPSTATS_MIB_FRAGFAILS);
92 92 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
93 93 htonl(dst_mtu(&rt->u.dst)));
94 94 goto drop;
net/ipv4/ip_output.c
Diff comments   View file @ 5e38e27
... ... @@ -182,9 +182,9 @@
182 182 unsigned int hh_len = LL_RESERVED_SPACE(dev);
183 183  
184 184 if (rt->rt_type == RTN_MULTICAST)
185   - IP_INC_STATS(IPSTATS_MIB_OUTMCASTPKTS);
  185 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTMCASTPKTS);
186 186 else if (rt->rt_type == RTN_BROADCAST)
187   - IP_INC_STATS(IPSTATS_MIB_OUTBCASTPKTS);
  187 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTBCASTPKTS);
188 188  
189 189 /* Be paranoid, rather than too clever. */
190 190 if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {
... ... @@ -244,7 +244,7 @@
244 244 /*
245 245 * If the indicated interface is up and running, send the packet.
246 246 */
247   - IP_INC_STATS(IPSTATS_MIB_OUTREQUESTS);
  247 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS);
248 248  
249 249 skb->dev = dev;
250 250 skb->protocol = htons(ETH_P_IP);
... ... @@ -298,7 +298,7 @@
298 298 {
299 299 struct net_device *dev = skb->dst->dev;
300 300  
301   - IP_INC_STATS(IPSTATS_MIB_OUTREQUESTS);
  301 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_OUTREQUESTS);
302 302  
303 303 skb->dev = dev;
304 304 skb->protocol = htons(ETH_P_IP);
... ... @@ -389,7 +389,7 @@
389 389 return ip_local_out(skb);
390 390  
391 391 no_route:
392   - IP_INC_STATS(IPSTATS_MIB_OUTNOROUTES);
  392 + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
393 393 kfree_skb(skb);
394 394 return -EHOSTUNREACH;
395 395 }
... ... @@ -451,7 +451,7 @@
451 451 iph = ip_hdr(skb);
452 452  
453 453 if (unlikely((iph->frag_off & htons(IP_DF)) && !skb->local_df)) {
454   - IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
  454 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
455 455 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
456 456 htonl(ip_skb_dst_mtu(skb)));
457 457 kfree_skb(skb);
... ... @@ -542,7 +542,7 @@
542 542 err = output(skb);
543 543  
544 544 if (!err)
545   - IP_INC_STATS(IPSTATS_MIB_FRAGCREATES);
  545 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGCREATES);
546 546 if (err || !frag)
547 547 break;
548 548  
... ... @@ -552,7 +552,7 @@
552 552 }
553 553  
554 554 if (err == 0) {
555   - IP_INC_STATS(IPSTATS_MIB_FRAGOKS);
  555 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGOKS);
556 556 return 0;
557 557 }
558 558  
... ... @@ -561,7 +561,7 @@
561 561 kfree_skb(frag);
562 562 frag = skb;
563 563 }
564   - IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
  564 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
565 565 return err;
566 566 }
567 567  
568 568  
569 569  
... ... @@ -673,15 +673,15 @@
673 673 if (err)
674 674 goto fail;
675 675  
676   - IP_INC_STATS(IPSTATS_MIB_FRAGCREATES);
  676 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGCREATES);
677 677 }
678 678 kfree_skb(skb);
679   - IP_INC_STATS(IPSTATS_MIB_FRAGOKS);
  679 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGOKS);
680 680 return err;
681 681  
682 682 fail:
683 683 kfree_skb(skb);
684   - IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
  684 + IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
685 685 return err;
686 686 }
687 687  
... ... @@ -1047,7 +1047,7 @@
1047 1047  
1048 1048 error:
1049 1049 inet->cork.length -= length;
1050   - IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
  1050 + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS);
1051 1051 return err;
1052 1052 }
1053 1053  
... ... @@ -1189,7 +1189,7 @@
1189 1189  
1190 1190 error:
1191 1191 inet->cork.length -= size;
1192   - IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
  1192 + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS);
1193 1193 return err;
1194 1194 }
1195 1195  
... ... @@ -1298,7 +1298,7 @@
1298 1298 return err;
1299 1299  
1300 1300 error:
1301   - IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
  1301 + IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);
1302 1302 goto out;
1303 1303 }
1304 1304  
... ... @@ -385,7 +385,7 @@
385 385 err = -EFAULT;
386 386 kfree_skb(skb);
387 387 error:
388   - IP_INC_STATS(IPSTATS_MIB_OUTDISCARDS);
  388 + IP_INC_STATS(net, IPSTATS_MIB_OUTDISCARDS);
389 389 return err;
390 390 }
391 391