tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mib: add net to NET_ADD_STATS_USER

Done with NET_XXX_STATS macros :)

To be continued...

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

authored by

Pavel Emelyanov and committed by
David S. Miller ed88098e f2bf415c

+4 -4
+1 -1
include/net/ip.h
··· 165 165 #define NET_INC_STATS_BH(net, field) do { (void)net; SNMP_INC_STATS_BH(net_statistics, field); } while (0) 166 166 #define NET_INC_STATS_USER(net, field) do { (void)net; SNMP_INC_STATS_USER(net_statistics, field); } while (0) 167 167 #define NET_ADD_STATS_BH(net, field, adnd) do { (void)net; SNMP_ADD_STATS_BH(net_statistics, field, adnd); } while (0) 168 - #define NET_ADD_STATS_USER(field, adnd) SNMP_ADD_STATS_USER(net_statistics, field, adnd) 168 + #define NET_ADD_STATS_USER(net, field, adnd) do { (void)net; SNMP_ADD_STATS_USER(net_statistics, field, adnd); } while (0) 169 169 170 170 extern unsigned long snmp_fold_field(void *mib[], int offt); 171 171 extern int snmp_mib_init(void *ptr[2], size_t mibsize);
+3 -3
net/ipv4/tcp.c
··· 1475 1475 /* __ Restore normal policy in scheduler __ */ 1476 1476 1477 1477 if ((chunk = len - tp->ucopy.len) != 0) { 1478 - NET_ADD_STATS_USER(LINUX_MIB_TCPDIRECTCOPYFROMBACKLOG, chunk); 1478 + NET_ADD_STATS_USER(sock_net(sk), LINUX_MIB_TCPDIRECTCOPYFROMBACKLOG, chunk); 1479 1479 len -= chunk; 1480 1480 copied += chunk; 1481 1481 } ··· 1486 1486 tcp_prequeue_process(sk); 1487 1487 1488 1488 if ((chunk = len - tp->ucopy.len) != 0) { 1489 - NET_ADD_STATS_USER(LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE, chunk); 1489 + NET_ADD_STATS_USER(sock_net(sk), LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE, chunk); 1490 1490 len -= chunk; 1491 1491 copied += chunk; 1492 1492 } ··· 1601 1601 tcp_prequeue_process(sk); 1602 1602 1603 1603 if (copied > 0 && (chunk = len - tp->ucopy.len) != 0) { 1604 - NET_ADD_STATS_USER(LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE, chunk); 1604 + NET_ADD_STATS_USER(sock_net(sk), LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE, chunk); 1605 1605 len -= chunk; 1606 1606 copied += chunk; 1607 1607 }