From: Johannes Berg Date: Thu, 3 Nov 2011 13:50:13 +0000 (+0100) Subject: cfg80211: allow setting TXQ parameters only in AP mode X-Git-Tag: upstream/snapshot3+hdmi~8468^2^2~58 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=133a3ff2c934223a8143bfa52401bba962a97165;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git cfg80211: allow setting TXQ parameters only in AP mode In other modes the parameters should not be set. Right now, mac80211 will set them, even if the user asked for setting them on VLANs which the driver doesn't know about, causing all kinds of trouble. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index b587857..b3a476f 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1252,6 +1252,12 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) goto bad_res; } + if (netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && + netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) { + result = -EINVAL; + goto bad_res; + } + nla_for_each_nested(nl_txq_params, info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS], rem_txq_params) {