2 files changed, 6 insertions, 2 deletions

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index d8adfd4972e2..4d8d95404f45 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -36,6 +36,7 @@
 #include <linux/mroute.h>
 #include <net/route.h>
 #include <net/xfrm.h>
+#include <net/compat.h>
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 #include <net/transp_v6.h>
 #endif
@@ -923,6 +924,10 @@ int compat_ip_setsockopt(struct sock *sk, int level, int optname,
         if (level != SOL_IP)
                 return -ENOPROTOOPT;
 
+        if (optname >= MCAST_JOIN_GROUP && optname <= MCAST_MSFILTER)
+                return compat_mc_setsockopt(sk, level, optname, optval, optlen,
+                        ip_setsockopt);
+
         err = do_ip_setsockopt(sk, level, optname, optval, optlen);
 #ifdef CONFIG_NETFILTER
         /* we need to exclude all possible ENOPROTOOPTs except default case */
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index ac9b8482f702..0298f80681f2 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4925,8 +4925,7 @@ step5:
         tcp_data_snd_check(sk);
         tcp_ack_snd_check(sk);
 
-        if (tcp_defer_accept_check(sk))
-                return -1;
+        tcp_defer_accept_check(sk);
         return 0;
 
 csum_error: