diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-01-24 01:31:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:57:02 -0500 |
commit | c69bce20dda7f79160856a338298d65a284ba303 (patch) | |
tree | 0a07716410f323aa716b0dfa3607070fa6d3fd8d /net/ipv4/af_inet.c | |
parent | 971b893e79db0f7dccfcea15dbdebca3ca64a84d (diff) |
[NET]: Remove unused "mibalign" argument for snmp_mib_init().
With fixes from Arnaldo Carvalho de Melo.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 0e4b6eba2340..7f8b27ff94ff 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1242,7 +1242,7 @@ unsigned long snmp_fold_field(void *mib[], int offt) | |||
1242 | } | 1242 | } |
1243 | EXPORT_SYMBOL_GPL(snmp_fold_field); | 1243 | EXPORT_SYMBOL_GPL(snmp_fold_field); |
1244 | 1244 | ||
1245 | int snmp_mib_init(void *ptr[2], size_t mibsize, size_t mibalign) | 1245 | int snmp_mib_init(void *ptr[2], size_t mibsize) |
1246 | { | 1246 | { |
1247 | BUG_ON(ptr == NULL); | 1247 | BUG_ON(ptr == NULL); |
1248 | ptr[0] = __alloc_percpu(mibsize); | 1248 | ptr[0] = __alloc_percpu(mibsize); |
@@ -1296,32 +1296,25 @@ static struct net_protocol icmp_protocol = { | |||
1296 | static int __init init_ipv4_mibs(void) | 1296 | static int __init init_ipv4_mibs(void) |
1297 | { | 1297 | { |
1298 | if (snmp_mib_init((void **)net_statistics, | 1298 | if (snmp_mib_init((void **)net_statistics, |
1299 | sizeof(struct linux_mib), | 1299 | sizeof(struct linux_mib)) < 0) |
1300 | __alignof__(struct linux_mib)) < 0) | ||
1301 | goto err_net_mib; | 1300 | goto err_net_mib; |
1302 | if (snmp_mib_init((void **)ip_statistics, | 1301 | if (snmp_mib_init((void **)ip_statistics, |
1303 | sizeof(struct ipstats_mib), | 1302 | sizeof(struct ipstats_mib)) < 0) |
1304 | __alignof__(struct ipstats_mib)) < 0) | ||
1305 | goto err_ip_mib; | 1303 | goto err_ip_mib; |
1306 | if (snmp_mib_init((void **)icmp_statistics, | 1304 | if (snmp_mib_init((void **)icmp_statistics, |
1307 | sizeof(struct icmp_mib), | 1305 | sizeof(struct icmp_mib)) < 0) |
1308 | __alignof__(struct icmp_mib)) < 0) | ||
1309 | goto err_icmp_mib; | 1306 | goto err_icmp_mib; |
1310 | if (snmp_mib_init((void **)icmpmsg_statistics, | 1307 | if (snmp_mib_init((void **)icmpmsg_statistics, |
1311 | sizeof(struct icmpmsg_mib), | 1308 | sizeof(struct icmpmsg_mib)) < 0) |
1312 | __alignof__(struct icmpmsg_mib)) < 0) | ||
1313 | goto err_icmpmsg_mib; | 1309 | goto err_icmpmsg_mib; |
1314 | if (snmp_mib_init((void **)tcp_statistics, | 1310 | if (snmp_mib_init((void **)tcp_statistics, |
1315 | sizeof(struct tcp_mib), | 1311 | sizeof(struct tcp_mib)) < 0) |
1316 | __alignof__(struct tcp_mib)) < 0) | ||
1317 | goto err_tcp_mib; | 1312 | goto err_tcp_mib; |
1318 | if (snmp_mib_init((void **)udp_statistics, | 1313 | if (snmp_mib_init((void **)udp_statistics, |
1319 | sizeof(struct udp_mib), | 1314 | sizeof(struct udp_mib)) < 0) |
1320 | __alignof__(struct udp_mib)) < 0) | ||
1321 | goto err_udp_mib; | 1315 | goto err_udp_mib; |
1322 | if (snmp_mib_init((void **)udplite_statistics, | 1316 | if (snmp_mib_init((void **)udplite_statistics, |
1323 | sizeof(struct udp_mib), | 1317 | sizeof(struct udp_mib)) < 0) |
1324 | __alignof__(struct udp_mib)) < 0) | ||
1325 | goto err_udplite_mib; | 1318 | goto err_udplite_mib; |
1326 | 1319 | ||
1327 | tcp_mib_init(); | 1320 | tcp_mib_init(); |