net/ipv4: Revert use of struct_size() helper

[linux-2.6-microblaze.git] / net / ipv4 / igmp.c

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index a5f4ecb..c2d477e 100644 (file)
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2553,8 +2553,8 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
        copycount = count < msf->imsf_numsrc ? count : msf->imsf_numsrc;
        len = flex_array_size(psl, sl_addr, copycount);
        msf->imsf_numsrc = count;
-       if (put_user(struct_size(optval, imsf_slist_flex, copycount), optlen) ||
-           copy_to_user(optval, msf, struct_size(optval, imsf_slist_flex, 0))) {
+       if (put_user(IP_MSFILTER_SIZE(copycount), optlen) ||
+           copy_to_user(optval, msf, IP_MSFILTER_SIZE(0))) {
                return -EFAULT;
        }
        if (len &&