From: Mark Brown <broonie@kernel.org>
Date: Fri, 10 Oct 2014 11:59:43 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~59
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8407e2ffb76d56c77b8eb8faa44b06b1b987ac3a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	net/wireless/nl80211.c
---

8407e2ffb76d56c77b8eb8faa44b06b1b987ac3a
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)