From: Stricted <info@stricted.net>
Date: Wed, 21 Mar 2018 21:28:46 +0000 (+0100)
Subject: Merge tag 'v3.10.57' into update
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f5aa73ff5c0753e91c658b6ce6af8baeac9608df;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge tag 'v3.10.57' into update

This is the 3.10.57 stable release
---

f5aa73ff5c0753e91c658b6ce6af8baeac9608df
diff --cc net/wireless/nl80211.c
index 9abf1969c114,62aebed7c6e2..43ab4b03d306
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -6642,17 -6597,15 +6642,20 @@@ void __cfg80211_send_event_skb(struct s
  	void *hdr = ((void **)skb->cb)[1];
  	struct nlattr *data = ((void **)skb->cb)[2];
  
+ 	/* clear CB data for netlink core to own from now on */
+ 	memset(skb->cb, 0, sizeof(skb->cb));
+ 
  	nla_nest_end(skb, data);
  	genlmsg_end(skb, hdr);
 -	genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
 -				nl80211_testmode_mcgrp.id, gfp);
 +
 +	if (data->nla_type == NL80211_ATTR_VENDOR_DATA)
 +		genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
 +			nl80211_vendor_mcgrp.id, gfp);
 +	else
 +		genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,
 +			nl80211_testmode_mcgrp.id, gfp);
  }
 -EXPORT_SYMBOL(cfg80211_testmode_event);
 +EXPORT_SYMBOL(__cfg80211_send_event_skb);
  #endif
  
  static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)