diff options
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 5dfecfd7d5e9..6699f23e6f55 100644 --- 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) | |||
344 | pip->protocol = IPPROTO_IGMP; | 344 | pip->protocol = IPPROTO_IGMP; |
345 | pip->tot_len = 0; /* filled in later */ | 345 | pip->tot_len = 0; /* filled in later */ |
346 | ip_select_ident(pip, &rt->dst, NULL); | 346 | ip_select_ident(pip, &rt->dst, NULL); |
347 | ((u8*)&pip[1])[0] = IPOPT_RA; | 347 | ((u8 *)&pip[1])[0] = IPOPT_RA; |
348 | ((u8*)&pip[1])[1] = 4; | 348 | ((u8 *)&pip[1])[1] = 4; |
349 | ((u8*)&pip[1])[2] = 0; | 349 | ((u8 *)&pip[1])[2] = 0; |
350 | ((u8*)&pip[1])[3] = 0; | 350 | ((u8 *)&pip[1])[3] = 0; |
351 | 351 | ||
352 | skb->transport_header = skb->network_header + sizeof(struct iphdr) + 4; | 352 | skb->transport_header = skb->network_header + sizeof(struct iphdr) + 4; |
353 | skb_put(skb, sizeof(*pig)); | 353 | skb_put(skb, sizeof(*pig)); |
@@ -688,10 +688,10 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, | |||
688 | iph->saddr = fl4.saddr; | 688 | iph->saddr = fl4.saddr; |
689 | iph->protocol = IPPROTO_IGMP; | 689 | iph->protocol = IPPROTO_IGMP; |
690 | ip_select_ident(iph, &rt->dst, NULL); | 690 | ip_select_ident(iph, &rt->dst, NULL); |
691 | ((u8*)&iph[1])[0] = IPOPT_RA; | 691 | ((u8 *)&iph[1])[0] = IPOPT_RA; |
692 | ((u8*)&iph[1])[1] = 4; | 692 | ((u8 *)&iph[1])[1] = 4; |
693 | ((u8*)&iph[1])[2] = 0; | 693 | ((u8 *)&iph[1])[2] = 0; |
694 | ((u8*)&iph[1])[3] = 0; | 694 | ((u8 *)&iph[1])[3] = 0; |
695 | 695 | ||
696 | ih = (struct igmphdr *)skb_put(skb, sizeof(struct igmphdr)); | 696 | ih = (struct igmphdr *)skb_put(skb, sizeof(struct igmphdr)); |
697 | ih->type = type; | 697 | ih->type = type; |
@@ -774,7 +774,7 @@ static int igmp_xmarksources(struct ip_mc_list *pmc, int nsrcs, __be32 *srcs) | |||
774 | if (psf->sf_count[MCAST_INCLUDE] || | 774 | if (psf->sf_count[MCAST_INCLUDE] || |
775 | pmc->sfcount[MCAST_EXCLUDE] != | 775 | pmc->sfcount[MCAST_EXCLUDE] != |
776 | psf->sf_count[MCAST_EXCLUDE]) | 776 | psf->sf_count[MCAST_EXCLUDE]) |
777 | continue; | 777 | break; |
778 | if (srcs[i] == psf->sf_inaddr) { | 778 | if (srcs[i] == psf->sf_inaddr) { |
779 | scount++; | 779 | scount++; |
780 | break; | 780 | break; |