diff --git a/[refs] b/[refs]
index 8c0ac266a355..8e4ed829ece6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e29b5d8f0896bfe908c0036f2614a89e71bdf42c
+refs/heads/master: bc2f7996858db66f2d5b154aac10971655f72cad
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 55011cb691ad..216719cb5c7f 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -1035,6 +1035,9 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
 
 		v.val = sk->sk_peek_off;
 		break;
+	case SO_NOFCS:
+		v.val = !!sock_flag(sk, SOCK_NOFCS);
+		break;
 	default:
 		return -ENOPROTOOPT;
 	}