From: David S. Miller <davem@davemloft.net>
Date: Tue, 27 Aug 2019 21:23:31 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=68aaf4459556b1f9370c259fd486aecad2257552;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

68aaf4459556b1f9370c259fd486aecad2257552
diff --cc net/mac80211/cfg.c
index ed56b0c6fe19e,111c400199ec5..7c6edb7c5f102
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -1546,9 -1543,14 +1546,14 @@@ static int ieee80211_add_station(struc
  	if (ether_addr_equal(mac, sdata->vif.addr))
  		return -EINVAL;
  
 -	if (is_multicast_ether_addr(mac))
 +	if (!is_valid_ether_addr(mac))
  		return -EINVAL;
  
+ 	if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER) &&
+ 	    sdata->vif.type == NL80211_IFTYPE_STATION &&
+ 	    !sdata->u.mgd.associated)
+ 		return -EINVAL;
+ 
  	sta = sta_info_alloc(sdata, mac, GFP_KERNEL);
  	if (!sta)
  		return -ENOMEM;