From b14028222bbaffbc17a1345c2f8d23b0ddb1a012 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Fri, 10 Sep 2010 20:26:56 +0000
Subject: [PATCH] --- yaml --- r: 210805 b: refs/heads/master c:
 a89b47639f3e11dd9a8eb78a5d3382e109c876f2 h: refs/heads/master i:   210803:
 35b5dac854b096e2bce7347ac58d235a72438423 v: v3

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

diff --git a/[refs] b/[refs]
index 3547e585887b..ac41824900ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7998156344b0d93de61ff8e5d75e96500e43a571
+refs/heads/master: a89b47639f3e11dd9a8eb78a5d3382e109c876f2
diff --git a/trunk/net/ipv4/ip_sockglue.c b/trunk/net/ipv4/ip_sockglue.c
index 6c40a8c46e79..64b70ad162e3 100644
--- a/trunk/net/ipv4/ip_sockglue.c
+++ b/trunk/net/ipv4/ip_sockglue.c
@@ -1129,6 +1129,9 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
 	case IP_HDRINCL:
 		val = inet->hdrincl;
 		break;
+	case IP_NODEFRAG:
+		val = inet->nodefrag;
+		break;
 	case IP_MTU_DISCOVER:
 		val = inet->pmtudisc;
 		break;