Commit f86a677e authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2019-07-31' of... 

Merge tag 'mac80211-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just a few fixes:
 * revert NETIF_F_LLTX usage as it caused problems
 * avoid warning on WMM parameters from AP that are too short
 * fix possible null-ptr dereference in hwsim
 * fix interface combinations with 4-addr and crypto control
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fa9586af eef347f8

drivers/net/wireless/mac80211_hwsim.c

+5 −3
Original line number Diff line number Diff line
@@ -3617,10 +3617,12 @@ static int hwsim_dump_radio_nl(struct sk_buff *skb, 
		hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid,

				  cb->nlh->nlmsg_seq, &hwsim_genl_family,

				  NLM_F_MULTI, HWSIM_CMD_GET_RADIO);

		if (!hdr)

			res = -EMSGSIZE;

		if (hdr) {

			genl_dump_check_consistent(cb, hdr);

			genlmsg_end(skb, hdr);

		} else {

			res = -EMSGSIZE;

		}

	}



done:

include/net/cfg80211.h

+15 −0
Original line number Diff line number Diff line
@@ -7320,6 +7320,21 @@ void cfg80211_pmsr_complete(struct wireless_dev *wdev, 
			    struct cfg80211_pmsr_request *req,

			    gfp_t gfp);



/**

 * cfg80211_iftype_allowed - check whether the interface can be allowed

 * @wiphy: the wiphy

 * @iftype: interface type

 * @is_4addr: use_4addr flag, must be '0' when check_swif is '1'

 * @check_swif: check iftype against software interfaces

 *

 * Check whether the interface is allowed to operate; additionally, this API

 * can be used to check iftype against the software interfaces when

 * check_swif is '1'.

 */

bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype,

			     bool is_4addr, u8 check_swif);





/* Logging, debugging and troubleshooting/diagnostic helpers. */



/* wiphy_printk helpers, similar to dev_printk */

net/mac80211/iface.c

+0 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,6 @@ static void ieee80211_if_setup(struct net_device *dev) 
static void ieee80211_if_setup_no_queue(struct net_device *dev)

{

	ieee80211_if_setup(dev);

	dev->features |= NETIF_F_LLTX;

	dev->priv_flags |= IFF_NO_QUEUE;

}

net/mac80211/mlme.c

+10 −0
Original line number Diff line number Diff line
@@ -2042,6 +2042,16 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local, 
		ieee80211_regulatory_limit_wmm_params(sdata, &params[ac], ac);

	}



	/* WMM specification requires all 4 ACIs. */

	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {

		if (params[ac].cw_min == 0) {

			sdata_info(sdata,

				   "AP has invalid WMM params (missing AC %d), using defaults\n",

				   ac);

			return false;

		}

	}



	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {

		mlme_dbg(sdata,

			 "WMM AC=%d acm=%d aifs=%d cWmin=%d cWmax=%d txop=%d uapsd=%d, downgraded=%d\n",

net/mac80211/util.c

+3 −4
Original line number Diff line number Diff line
@@ -3796,9 +3796,7 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, 
	}



	/* Always allow software iftypes */

	if (local->hw.wiphy->software_iftypes & BIT(iftype) ||

	    (iftype == NL80211_IFTYPE_AP_VLAN &&

	     local->hw.wiphy->flags & WIPHY_FLAG_4ADDR_AP)) {

	if (cfg80211_iftype_allowed(local->hw.wiphy, iftype, 0, 1)) {

		if (radar_detect)

			return -EINVAL;

		return 0;
@@ -3833,7 +3831,8 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, 


		if (sdata_iter == sdata ||

		    !ieee80211_sdata_running(sdata_iter) ||

		    local->hw.wiphy->software_iftypes & BIT(wdev_iter->iftype))

		    cfg80211_iftype_allowed(local->hw.wiphy,

					    wdev_iter->iftype, 0, 1))

			continue;



		params.iftype_num[wdev_iter->iftype]++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE