summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-16 10:24:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-07 12:52:24 -0700
commit239ab3670a5241414b5e60bf8be0c819468c160c (patch)
treed2473d492f43dfb155e82cfb40f3fbc210c187f9 /net
parentc183f01b8c909323c42c77304f2fc4ad68cbd4a8 (diff)
cfg80211: fix sending WoWLAN TCP wakeup settings
commit e248ad30204eff6559b4d2d94d49d9d46c08185a upstream. The code sending the current WoWLAN TCP wakeup settings in nl80211_send_wowlan_tcp() is not closing the nested attribute, thus causing the parser to get confused on the receiver side in userspace (iw). Fix this. Reported-by: Deepak Arora <deepakx.arora@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 58e13a8c95f9..34ef5227d617 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7177,6 +7177,8 @@ static int nl80211_send_wowlan_tcp(struct sk_buff *msg,
&tcp->payload_tok))
return -ENOBUFS;
+ nla_nest_end(msg, nl_tcp);
+
return 0;
}