From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 22 Feb 2019 12:48:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7b14ec1ebef35d22f3f4087816468f22c987f75;p=linux.git

Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next to resolve a conflict and to get the mac80211
rhashtable fixes so further patches can be applied on top.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

b7b14ec1ebef35d22f3f4087816468f22c987f75
diff --cc net/wireless/pmsr.c
index 21139b82749f6,0216ab5552498..5e2ab01d325c8
--- a/net/wireless/pmsr.c
+++ b/net/wireless/pmsr.c
@@@ -256,9 -256,8 +256,8 @@@ int nl80211_pmsr_start(struct sk_buff *
  		if (err)
  			goto out_err;
  	} else {
- 		memcpy(req->mac_addr, nla_data(info->attrs[NL80211_ATTR_MAC]),
- 		       ETH_ALEN);
+ 		memcpy(req->mac_addr, wdev_address(wdev), ETH_ALEN);
 -		memset(req->mac_addr_mask, 0xff, ETH_ALEN);
 +		eth_broadcast_addr(req->mac_addr_mask);
  	}
  
  	idx = 0;