diff options
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index f8b172f89811..fc7c481d0d79 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
| @@ -677,11 +677,11 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, | |||
| 677 | mreq.imr_address.s_addr = mreqs.imr_interface; | 677 | mreq.imr_address.s_addr = mreqs.imr_interface; |
| 678 | mreq.imr_ifindex = 0; | 678 | mreq.imr_ifindex = 0; |
| 679 | err = ip_mc_join_group(sk, &mreq); | 679 | err = ip_mc_join_group(sk, &mreq); |
| 680 | if (err) | 680 | if (err && err != -EADDRINUSE) |
| 681 | break; | 681 | break; |
| 682 | omode = MCAST_INCLUDE; | 682 | omode = MCAST_INCLUDE; |
| 683 | add = 1; | 683 | add = 1; |
| 684 | } else /*IP_DROP_SOURCE_MEMBERSHIP */ { | 684 | } else /* IP_DROP_SOURCE_MEMBERSHIP */ { |
| 685 | omode = MCAST_INCLUDE; | 685 | omode = MCAST_INCLUDE; |
| 686 | add = 0; | 686 | add = 0; |
| 687 | } | 687 | } |
| @@ -754,7 +754,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, | |||
| 754 | mreq.imr_address.s_addr = 0; | 754 | mreq.imr_address.s_addr = 0; |
| 755 | mreq.imr_ifindex = greqs.gsr_interface; | 755 | mreq.imr_ifindex = greqs.gsr_interface; |
| 756 | err = ip_mc_join_group(sk, &mreq); | 756 | err = ip_mc_join_group(sk, &mreq); |
| 757 | if (err) | 757 | if (err && err != -EADDRINUSE) |
| 758 | break; | 758 | break; |
| 759 | greqs.gsr_interface = mreq.imr_ifindex; | 759 | greqs.gsr_interface = mreq.imr_ifindex; |
| 760 | omode = MCAST_INCLUDE; | 760 | omode = MCAST_INCLUDE; |