]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ipv4/igmp: fix build error if !CONFIG_IP_MULTICAST
authorEric Dumazet <edumazet@google.com>
Thu, 23 May 2019 01:35:16 +0000 (18:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 May 2019 05:08:06 +0000 (22:08 -0700)
ip_sf_list_clear_all() needs to be defined even if !CONFIG_IP_MULTICAST

Fixes: 3580d04aa674 ("ipv4/igmp: fix another memory leak in igmpv3_del_delrec()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/igmp.c

index 1a8d36dd49d40a0bd352e78e87b87735f894e2cf..eb03153dfe12b23b86d24bd08882354656ccf152 100644 (file)
@@ -188,6 +188,17 @@ static void ip_ma_put(struct ip_mc_list *im)
             pmc != NULL;                                       \
             pmc = rtnl_dereference(pmc->next_rcu))
 
+static void ip_sf_list_clear_all(struct ip_sf_list *psf)
+{
+       struct ip_sf_list *next;
+
+       while (psf) {
+               next = psf->sf_next;
+               kfree(psf);
+               psf = next;
+       }
+}
+
 #ifdef CONFIG_IP_MULTICAST
 
 /*
@@ -633,17 +644,6 @@ static void igmpv3_clear_zeros(struct ip_sf_list **ppsf)
        }
 }
 
-static void ip_sf_list_clear_all(struct ip_sf_list *psf)
-{
-       struct ip_sf_list *next;
-
-       while (psf) {
-               next = psf->sf_next;
-               kfree(psf);
-               psf = next;
-       }
-}
-
 static void kfree_pmc(struct ip_mc_list *pmc)
 {
        ip_sf_list_clear_all(pmc->sources);