Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / igmp.c

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 5dfecfd7d5e9fb9cfe154ad21eb93de60a3fd152..6699f23e6f55b0012cc50b74030f415362efbed1 100644 (file)
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -344,10 +344,10 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
        pip->protocol = IPPROTO_IGMP;
        pip->tot_len  = 0;      /* filled in later */
        ip_select_ident(pip, &rt->dst, NULL);
-       ((u8*)&pip[1])[0] = IPOPT_RA;
-       ((u8*)&pip[1])[1] = 4;
-       ((u8*)&pip[1])[2] = 0;
-       ((u8*)&pip[1])[3] = 0;
+       ((u8 *)&pip[1])[0] = IPOPT_RA;
+       ((u8 *)&pip[1])[1] = 4;
+       ((u8 *)&pip[1])[2] = 0;
+       ((u8 *)&pip[1])[3] = 0;
 
        skb->transport_header = skb->network_header + sizeof(struct iphdr) + 4;
        skb_put(skb, sizeof(*pig));
@@ -688,10 +688,10 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
        iph->saddr    = fl4.saddr;
        iph->protocol = IPPROTO_IGMP;
        ip_select_ident(iph, &rt->dst, NULL);
-       ((u8*)&iph[1])[0] = IPOPT_RA;
-       ((u8*)&iph[1])[1] = 4;
-       ((u8*)&iph[1])[2] = 0;
-       ((u8*)&iph[1])[3] = 0;
+       ((u8 *)&iph[1])[0] = IPOPT_RA;
+       ((u8 *)&iph[1])[1] = 4;
+       ((u8 *)&iph[1])[2] = 0;
+       ((u8 *)&iph[1])[3] = 0;
 
        ih = (struct igmphdr *)skb_put(skb, sizeof(struct igmphdr));
        ih->type = type;
@@ -774,7 +774,7 @@ static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __be32 *srcs)
                        if (psf->sf_count[MCAST_INCLUDE] ||
                            pmc->sfcount[MCAST_EXCLUDE] !=
                            psf->sf_count[MCAST_EXCLUDE])
-                               continue;
+                               break;
                        if (srcs[i] == psf->sf_inaddr) {
                                scount++;
                                break;