snmp: add align parameter to snmp_mib_init()
In preparation for 64bit snmp counters for some mibs, add an 'align' parameter to snmp_mib_init(), instead of assuming mibs only contain 'unsigned long' fields. Callers can use __alignof__(type) to provide correct alignment. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> CC: Herbert Xu <herbert@gondor.apana.org.au> CC: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> CC: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> CC: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
5eaa0bd81f
commit
1823e4c80e
@@ -971,19 +971,24 @@ static void ipv6_packet_cleanup(void)
|
||||
static int __net_init ipv6_init_mibs(struct net *net)
|
||||
{
|
||||
if (snmp_mib_init((void __percpu **)net->mib.udp_stats_in6,
|
||||
sizeof (struct udp_mib)) < 0)
|
||||
sizeof(struct udp_mib),
|
||||
__alignof__(struct udp_mib)) < 0)
|
||||
return -ENOMEM;
|
||||
if (snmp_mib_init((void __percpu **)net->mib.udplite_stats_in6,
|
||||
sizeof (struct udp_mib)) < 0)
|
||||
sizeof(struct udp_mib),
|
||||
__alignof__(struct udp_mib)) < 0)
|
||||
goto err_udplite_mib;
|
||||
if (snmp_mib_init((void __percpu **)net->mib.ipv6_statistics,
|
||||
sizeof(struct ipstats_mib)) < 0)
|
||||
sizeof(struct ipstats_mib),
|
||||
__alignof__(struct ipstats_mib)) < 0)
|
||||
goto err_ip_mib;
|
||||
if (snmp_mib_init((void __percpu **)net->mib.icmpv6_statistics,
|
||||
sizeof(struct icmpv6_mib)) < 0)
|
||||
sizeof(struct icmpv6_mib),
|
||||
__alignof__(struct icmpv6_mib)) < 0)
|
||||
goto err_icmp_mib;
|
||||
if (snmp_mib_init((void __percpu **)net->mib.icmpv6msg_statistics,
|
||||
sizeof(struct icmpv6msg_mib)) < 0)
|
||||
sizeof(struct icmpv6msg_mib),
|
||||
__alignof__(struct icmpv6msg_mib)) < 0)
|
||||
goto err_icmpmsg_mib;
|
||||
return 0;
|
||||
|
||||
|
Reference in New Issue
Block a user