Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd6c6598 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

nl80211: refactor valid channel type check 



There are four instances in nl80211 of getting the
channel type from the attribute and validating it,
refactor those.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 294a20e0

net/wireless/nl80211.c

+29 −30
Original line number Original line Diff line number Diff line
@@ -1179,6 +1179,27 @@ static bool nl80211_can_set_dev_channel(struct wireless_dev *wdev) 
		wdev->iftype == NL80211_IFTYPE_P2P_GO;

		wdev->iftype == NL80211_IFTYPE_P2P_GO;

}

}





static bool nl80211_valid_channel_type(struct genl_info *info,

				       enum nl80211_channel_type *channel_type)

{

	enum nl80211_channel_type tmp;



	if (!info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE])

		return false;



	tmp = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);

	if (tmp != NL80211_CHAN_NO_HT &&

	    tmp != NL80211_CHAN_HT20 &&

	    tmp != NL80211_CHAN_HT40PLUS &&

	    tmp != NL80211_CHAN_HT40MINUS)

		return false;



	if (channel_type)

		*channel_type = tmp;



	return true;

}



static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,

static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,

				 struct wireless_dev *wdev,

				 struct wireless_dev *wdev,

				 struct genl_info *info)

				 struct genl_info *info)
@@ -1193,15 +1214,9 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev, 
	if (!nl80211_can_set_dev_channel(wdev))

	if (!nl80211_can_set_dev_channel(wdev))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {

	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&

		channel_type = nla_get_u32(info->attrs[

	    !nl80211_valid_channel_type(info, &channel_type))

				   NL80211_ATTR_WIPHY_CHANNEL_TYPE]);

		if (channel_type != NL80211_CHAN_NO_HT &&

		    channel_type != NL80211_CHAN_HT20 &&

		    channel_type != NL80211_CHAN_HT40PLUS &&

		    channel_type != NL80211_CHAN_HT40MINUS)

		return -EINVAL;

		return -EINVAL;

	}





	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);

	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
@@ -4918,12 +4933,7 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) 
	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {

	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {

		enum nl80211_channel_type channel_type;

		enum nl80211_channel_type channel_type;





		channel_type = nla_get_u32(

		if (!nl80211_valid_channel_type(info, &channel_type))

				info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);

		if (channel_type != NL80211_CHAN_NO_HT &&

		    channel_type != NL80211_CHAN_HT20 &&

		    channel_type != NL80211_CHAN_HT40MINUS &&

		    channel_type != NL80211_CHAN_HT40PLUS)

			return -EINVAL;

			return -EINVAL;





		if (channel_type != NL80211_CHAN_NO_HT &&

		if (channel_type != NL80211_CHAN_NO_HT &&
@@ -5491,15 +5501,9 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, 
	    !(rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL))

	    !(rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {

	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&

		channel_type = nla_get_u32(

	    !nl80211_valid_channel_type(info, &channel_type))

			info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);

		if (channel_type != NL80211_CHAN_NO_HT &&

		    channel_type != NL80211_CHAN_HT20 &&

		    channel_type != NL80211_CHAN_HT40PLUS &&

		    channel_type != NL80211_CHAN_HT40MINUS)

		return -EINVAL;

		return -EINVAL;

	}





	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);

	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);

	chan = rdev_freq_to_chan(rdev, freq, channel_type);

	chan = rdev_freq_to_chan(rdev, freq, channel_type);
@@ -5770,12 +5774,7 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info) 
	}

	}





	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {

	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {

		channel_type = nla_get_u32(

		if (!nl80211_valid_channel_type(info, &channel_type))

			info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);

		if (channel_type != NL80211_CHAN_NO_HT &&

		    channel_type != NL80211_CHAN_HT20 &&

		    channel_type != NL80211_CHAN_HT40PLUS &&

		    channel_type != NL80211_CHAN_HT40MINUS)

			return -EINVAL;

			return -EINVAL;

		channel_type_valid = true;

		channel_type_valid = true;

	}

	}