diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
| commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
| tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /include/net/ip.h | |
| parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 3b40bc2234be..250e6ef025a4 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
| @@ -156,17 +156,14 @@ struct ipv4_config | |||
| 156 | }; | 156 | }; |
| 157 | 157 | ||
| 158 | extern struct ipv4_config ipv4_config; | 158 | extern struct ipv4_config ipv4_config; |
| 159 | DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics); | 159 | #define IP_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.ip_statistics, field) |
| 160 | #define IP_INC_STATS(field) SNMP_INC_STATS(ip_statistics, field) | 160 | #define IP_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.ip_statistics, field) |
| 161 | #define IP_INC_STATS_BH(field) SNMP_INC_STATS_BH(ip_statistics, field) | 161 | #define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH((net)->mib.ip_statistics, field, val) |
| 162 | #define IP_INC_STATS_USER(field) SNMP_INC_STATS_USER(ip_statistics, field) | 162 | #define NET_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.net_statistics, field) |
| 163 | #define IP_ADD_STATS_BH(field, val) SNMP_ADD_STATS_BH(ip_statistics, field, val) | 163 | #define NET_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.net_statistics, field) |
| 164 | DECLARE_SNMP_STAT(struct linux_mib, net_statistics); | 164 | #define NET_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)->mib.net_statistics, field) |
| 165 | #define NET_INC_STATS(field) SNMP_INC_STATS(net_statistics, field) | 165 | #define NET_ADD_STATS_BH(net, field, adnd) SNMP_ADD_STATS_BH((net)->mib.net_statistics, field, adnd) |
| 166 | #define NET_INC_STATS_BH(field) SNMP_INC_STATS_BH(net_statistics, field) | 166 | #define NET_ADD_STATS_USER(net, field, adnd) SNMP_ADD_STATS_USER((net)->mib.net_statistics, field, adnd) |
| 167 | #define NET_INC_STATS_USER(field) SNMP_INC_STATS_USER(net_statistics, field) | ||
| 168 | #define NET_ADD_STATS_BH(field, adnd) SNMP_ADD_STATS_BH(net_statistics, field, adnd) | ||
| 169 | #define NET_ADD_STATS_USER(field, adnd) SNMP_ADD_STATS_USER(net_statistics, field, adnd) | ||
| 170 | 167 | ||
| 171 | extern unsigned long snmp_fold_field(void *mib[], int offt); | 168 | extern unsigned long snmp_fold_field(void *mib[], int offt); |
| 172 | extern int snmp_mib_init(void *ptr[2], size_t mibsize); | 169 | extern int snmp_mib_init(void *ptr[2], size_t mibsize); |
| @@ -191,6 +188,8 @@ extern int sysctl_ip_dynaddr; | |||
| 191 | 188 | ||
| 192 | extern void ipfrag_init(void); | 189 | extern void ipfrag_init(void); |
| 193 | 190 | ||
| 191 | extern void ip_static_sysctl_init(void); | ||
| 192 | |||
| 194 | #ifdef CONFIG_INET | 193 | #ifdef CONFIG_INET |
| 195 | #include <net/dst.h> | 194 | #include <net/dst.h> |
| 196 | 195 | ||