From 12222642d80c53964f8c547b178cd0cea93ca463 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 24 Feb 2012 14:48:34 -0500
Subject: [PATCH] --- yaml --- r: 290457 b: refs/heads/master c:
 bc2f7996858db66f2d5b154aac10971655f72cad h: refs/heads/master i:   290455:
 79b1064b70ae2e8102d335c01a2194d6ab5282a7 v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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;
 	}