: Remove unused "mibalign" argument for snmp_mib_init().
Subsystems (3)
PATCH 1/1 : Remove unused "mibalign" argument for snmp_mib_init().
---
include/net/ip.h +1 -1
@@ -169,7 +169,7 @@ DECLARE_SNMP_STAT(struct linux_mib, net_statistics);#define NET_ADD_STATS_USER (field, adnd) SNMP_ADD_STATS_USER(net_statistics, field, adnd)extern unsigned long snmp_fold_field (void *mib[],int offt); -extern int snmp_mib_init (void *ptr[2 ],size_t mibsize,size_t mibalign); +extern int snmp_mib_init (void *ptr[2 ],size_t mibsize);extern void snmp_mib_free (void *ptr[2 ]);extern void inet_get_local_port_range (int *low,int *high);
net/ipv4/af_inet.c +8 -15
@@ -1237,7 +1237,7 @@ unsigned long snmp_fold_field(void *mib[], int offt) }EXPORT_SYMBOL_GPL (snmp_fold_field); -int snmp_mib_init (void *ptr[2 ],size_t mibsize,size_t mibalign) +int snmp_mib_init (void *ptr[2 ],size_t mibsize) {BUG_ON (ptr ==NULL ); ptr[0 ] =__alloc_percpu (mibsize);
@@ -1291,32 +1291,25 @@ static struct net_protocol icmp_protocol = {static int __init init_ipv4_mibs (void ) {if (snmp_mib_init ((void **)net_statistics, -sizeof (struct linux_mib ), - __alignof__(struct linux_mib )) <0 ) +sizeof (struct linux_mib )) <0 ) goto err_net_mib;if (snmp_mib_init ((void **)ip_statistics, -sizeof (struct ipstats_mib ), - __alignof__(struct ipstats_mib )) <0 ) +sizeof (struct ipstats_mib )) <0 ) goto err_ip_mib;if (snmp_mib_init ((void **)icmp_statistics, -sizeof (struct icmp_mib ), - __alignof__(struct icmp_mib )) <0 ) +sizeof (struct icmp_mib )) <0 ) goto err_icmp_mib;if (snmp_mib_init ((void **)icmpmsg_statistics, -sizeof (struct icmpmsg_mib ), - __alignof__(struct icmpmsg_mib )) <0 ) +sizeof (struct icmpmsg_mib )) <0 ) goto err_icmpmsg_mib;if (snmp_mib_init ((void **)tcp_statistics, -sizeof (struct tcp_mib ), - __alignof__(struct tcp_mib )) <0 ) +sizeof (struct tcp_mib )) <0 ) goto err_tcp_mib;if (snmp_mib_init ((void **)udp_statistics, -sizeof (struct udp_mib ), - __alignof__(struct udp_mib )) <0 ) +sizeof (struct udp_mib )) <0 ) goto err_udp_mib;if (snmp_mib_init ((void **)udplite_statistics, -sizeof (struct udp_mib ), - __alignof__(struct udp_mib )) <0 ) +sizeof (struct udp_mib )) <0 ) goto err_udplite_mib;tcp_mib_init ();
net/ipv6/addrconf.c +3 -6
@@ -257,16 +257,13 @@ static void addrconf_mod_timer(struct inet6_ifaddr *ifp,static int snmp6_alloc_dev (struct inet6_dev *idev) {if (snmp_mib_init ((void **)idev->stats.ipv6, -sizeof (struct ipstats_mib ), - __alignof__(struct ipstats_mib )) <0 ) +sizeof (struct ipstats_mib )) <0 ) goto err_ip;if (snmp_mib_init ((void **)idev->stats.icmpv6, -sizeof (struct icmpv6_mib ), - __alignof__(struct icmpv6_mib )) <0 ) +sizeof (struct icmpv6_mib )) <0 ) goto err_icmp;if (snmp_mib_init ((void **)idev->stats.icmpv6msg, -sizeof (struct icmpv6msg_mib ), - __alignof__(struct icmpv6msg_mib )) <0 ) +sizeof (struct icmpv6msg_mib )) <0 ) goto err_icmpmsg;return 0 ;
Signature · 2 lines
YOSHIFUJI Hideaki @ USAGI Project <[email protected]> GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
From: YOSHIFUJI Hideaki / 吉藤英明 <[email protected]>
Date: Sat, 08 Dec 2007 00:41:28 -0800 (PST)
Quoted 1 line
Signed-off-by YOSHIFUJI Hideaki <[email protected]>
Applied, thanks.
PATCH 1/1 : Finish removing unused "mibalign" argument for snmp_mib_init().
net/ipv6/af_inet6.c +8 -9
@@ -714,20 +714,19 @@ EXPORT_SYMBOL_GPL(ipv6_opt_accepted);static int __init init_ipv6_mibs (void ) { -if (snmp_mib_init ((void **)ipv6_statistics,sizeof (struct ipstats_mib ), - __alignof__(struct ipstats_mib )) <0 ) +if (snmp_mib_init ((void **)ipv6_statistics, +sizeof (struct ipstats_mib )) <0 ) goto err_ip_mib; -if (snmp_mib_init ((void **)icmpv6_statistics,sizeof (struct icmpv6_mib ), - __alignof__(struct icmpv6_mib )) <0 ) +if (snmp_mib_init ((void **)icmpv6_statistics, +sizeof (struct icmpv6_mib )) <0 ) goto err_icmp_mib;if (snmp_mib_init ((void **)icmpv6msg_statistics, -sizeof (struct icmpv6msg_mib ), __alignof__(struct icmpv6_mib )) <0 ) +sizeof (struct icmpv6msg_mib )) <0 ) goto err_icmpmsg_mib; -if (snmp_mib_init ((void **)udp_stats_in6,sizeof (struct udp_mib ), - __alignof__(struct udp_mib )) <0 ) +if (snmp_mib_init ((void **)udp_stats_in6,sizeof (struct udp_mib )) <0 ) goto err_udp_mib; -if (snmp_mib_init ((void **)udplite_stats_in6,sizeof (struct udp_mib ), - __alignof__(struct udp_mib )) <0 ) +if (snmp_mib_init ((void **)udplite_stats_in6, +sizeof (struct udp_mib )) <0 ) goto err_udplite_mib;return 0 ;
Re: [PATCH][NET]: Finish removing unused "mibalign" argument for snmp_mib_init().
Hello.
In article <[email protected]> (at Sat, 8 Dec 2007 15:55:34 -0200), Arnaldo Carvalho de Melo <[email protected]> says:
Quoted 7 lines
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>net/ipv6/af_inet6.c +0
-0
net/ipv6/af_inet6.c EXPORT_SYMBOL_GPL(ipv6_opt_accepted); · line 719
Quoted 8 lines
net/ipv6/af_inet6.c +2
-2@@ -714,20 +714,19 @@ EXPORT_SYMBOL_GPL(ipv6_opt_accepted);static int __init init_ipv6_mibs (void ) { -if (snmp_mib_init ((void **)ipv6_statistics,sizeof (struct ipstats_mib ), - __alignof__(struct ipstats_mib )) <0 ) +if (snmp_mib_init ((void **)ipv6_statistics, +sizeof (struct ipstats_mib )) <0 ) goto err_ip_mib;
Oops... thanks.
--yoshfuji
Re: [PATCH][NET]: Finish removing unused "mibalign" argument for snmp_mib_init().
From: YOSHIFUJI Hideaki / 吉藤英明 <[email protected]>
Date: Sat, 08 Dec 2007 10:13:54 -0800 (PST)
Quoted 21 lines
Hello.
In article <[email protected]> (at Sat, 8 Dec 2007 15:55:34 -0200), Arnaldo Carvalho de Melo <[email protected]> says:
Quoted 7 lines
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>net/ipv6/af_inet6.c +0
-0net/ipv6/af_inet6.c EXPORT_SYMBOL_GPL(ipv6_opt_accepted); · line 719
Quoted 8 lines
net/ipv6/af_inet6.c +2
-2@@ -714,20 +714,19 @@ EXPORT_SYMBOL_GPL(ipv6_opt_accepted);static int __init init_ipv6_mibs (void ) { -if (snmp_mib_init ((void **)ipv6_statistics,sizeof (struct ipstats_mib ), - __alignof__(struct ipstats_mib )) <0 ) +if (snmp_mib_init ((void **)ipv6_statistics, +sizeof (struct ipstats_mib )) <0 ) goto err_ip_mib;Oops... thanks.
Quoted 1 line
Applied, thanks.