diff --git a/[refs] b/[refs] index 204a7e903a58..b1c69004cfcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32092ecf0644e91070f9eff4f6e1edda8f90aecc +refs/heads/master: 5eb81e89164a5cea31dbc2df37a33588d4466352 diff --git a/trunk/net/ipv4/igmp.c b/trunk/net/ipv4/igmp.c index 313ad93d2f7b..fa057d105bef 100644 --- a/trunk/net/ipv4/igmp.c +++ b/trunk/net/ipv4/igmp.c @@ -1579,7 +1579,7 @@ static int ip_mc_del_src(struct in_device *in_dev, __be32 *pmca, int sfmode, * Add multicast single-source filter to the interface list */ static int ip_mc_add1_src(struct ip_mc_list *pmc, int sfmode, - __be32 *psfsrc, int delta) + __be32 *psfsrc) { struct ip_sf_list *psf, *psf_prev; @@ -1714,7 +1714,7 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode, pmc->sfcount[sfmode]++; err = 0; for (i=0; i