From e9f20939200a067fd813f448e63f93e5b33dc9e7 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 7 Oct 2011 03:30:20 +0000
Subject: [PATCH] --- yaml --- r: 266469 b: refs/heads/master c:
 8083f0fc969d9b5353061a7a6f963405057e26b1 h: refs/heads/master i:   266467:
 f7ab6818ad5c45c643ff1795ae675504017934ee v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index aa6f56c39c41..2c0e4ba8475e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5b1d8cd8f32c5fd0baa7c264091d1abbf17c03c
+refs/heads/master: 8083f0fc969d9b5353061a7a6f963405057e26b1
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index b29ab61b029c..83c462d3f451 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -738,10 +738,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 		/* We implement the SO_SNDLOWAT etc to
 		   not be settable (1003.1g 5.3) */
 	case SO_RXQ_OVFL:
-		if (valbool)
-			sock_set_flag(sk, SOCK_RXQ_OVFL);
-		else
-			sock_reset_flag(sk, SOCK_RXQ_OVFL);
+		sock_valbool_flag(sk, SOCK_RXQ_OVFL, valbool);
 		break;
 	default:
 		ret = -ENOPROTOOPT;