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

Commit d0ae708d authored by Johannes Berg's avatar Johannes Berg
Browse files

nl80211: remove channel width and extended capa advertising 



This is another case of data increasing the size of the
wiphy information significantly with a new feature, for
now remove this as well.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 49921859

net/wireless/core.c

+1 −2
Original line number Diff line number Diff line
@@ -367,8 +367,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv) 
	rdev->wiphy.rts_threshold = (u32) -1;

	rdev->wiphy.coverage_class = 0;



	rdev->wiphy.features = NL80211_FEATURE_SCAN_FLUSH |

			       NL80211_FEATURE_ADVERTISE_CHAN_LIMITS;

	rdev->wiphy.features = NL80211_FEATURE_SCAN_FLUSH;



	return &rdev->wiphy;

}

net/wireless/nl80211.c

+0 −21
Original line number Diff line number Diff line
@@ -557,18 +557,6 @@ static int nl80211_msg_put_channel(struct sk_buff *msg, 
	if ((chan->flags & IEEE80211_CHAN_RADAR) &&

	    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))

		goto nla_put_failure;

	if ((chan->flags & IEEE80211_CHAN_NO_HT40MINUS) &&

	    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HT40_MINUS))

		goto nla_put_failure;

	if ((chan->flags & IEEE80211_CHAN_NO_HT40PLUS) &&

	    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HT40_PLUS))

		goto nla_put_failure;

	if ((chan->flags & IEEE80211_CHAN_NO_80MHZ) &&

	    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_80MHZ))

		goto nla_put_failure;

	if ((chan->flags & IEEE80211_CHAN_NO_160MHZ) &&

	    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_160MHZ))

		goto nla_put_failure;



	if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_MAX_TX_POWER,

			DBM_TO_MBM(chan->max_power)))
@@ -1310,15 +1298,6 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 portid, u32 seq, int flag 
			dev->wiphy.max_acl_mac_addrs))

		goto nla_put_failure;



	if (dev->wiphy.extended_capabilities &&

	    (nla_put(msg, NL80211_ATTR_EXT_CAPA,

		     dev->wiphy.extended_capabilities_len,

		     dev->wiphy.extended_capabilities) ||

	     nla_put(msg, NL80211_ATTR_EXT_CAPA_MASK,

		     dev->wiphy.extended_capabilities_len,

		     dev->wiphy.extended_capabilities_mask)))

		goto nla_put_failure;



	return genlmsg_end(msg, hdr);



 nla_put_failure: