Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	include/net/bluetooth/bluetooth.h

1 files changed, 9 insertions, 0 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 2de9dc29595..9a8b3fac140 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -740,6 +740,11 @@ set_rcvbuf:
         case SO_RXQ_OVFL:
                 sock_valbool_flag(sk, SOCK_RXQ_OVFL, valbool);
                 break;
+
+        case SO_WIFI_STATUS:
+                sock_valbool_flag(sk, SOCK_WIFI_STATUS, valbool);
+                break;
+
         default:
                 ret = -ENOPROTOOPT;
                 break;
@@ -961,6 +966,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                 v.val = !!sock_flag(sk, SOCK_RXQ_OVFL);
                 break;
 
+        case SO_WIFI_STATUS:
+                v.val = !!sock_flag(sk, SOCK_WIFI_STATUS);
+                break;
+
         default:
                 return -ENOPROTOOPT;
         }