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

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

mac80211: don't expose ieee80211_add_srates_ie() 



This and ieee80211_add_ext_srates_ie() aren't
exported, so can't be used by drivers anyway,
but there's also no reason that they should be
so make them private to mac80211 and use sdata
instead of vif arguments.

Acked-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dfb89c56

include/net/mac80211.h

+0 −6
Original line number Diff line number Diff line
@@ -3826,12 +3826,6 @@ void ieee80211_enable_rssi_reports(struct ieee80211_vif *vif, 


void ieee80211_disable_rssi_reports(struct ieee80211_vif *vif);



int ieee80211_add_srates_ie(struct ieee80211_vif *vif,

			    struct sk_buff *skb, bool need_basic);



int ieee80211_add_ext_srates_ie(struct ieee80211_vif *vif,

				struct sk_buff *skb, bool need_basic);



/**

 * ieee80211_ave_rssi - report the average rssi for the specified interface

 *

net/mac80211/cfg.c

+6 −6
Original line number Diff line number Diff line
@@ -2665,8 +2665,8 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev, 
		tf->u.setup_req.capability =

			cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata));



		ieee80211_add_srates_ie(&sdata->vif, skb, false);

		ieee80211_add_ext_srates_ie(&sdata->vif, skb, false);

		ieee80211_add_srates_ie(sdata, skb, false);

		ieee80211_add_ext_srates_ie(sdata, skb, false);

		ieee80211_tdls_add_ext_capab(skb);

		break;

	case WLAN_TDLS_SETUP_RESPONSE:
@@ -2679,8 +2679,8 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev, 
		tf->u.setup_resp.capability =

			cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata));



		ieee80211_add_srates_ie(&sdata->vif, skb, false);

		ieee80211_add_ext_srates_ie(&sdata->vif, skb, false);

		ieee80211_add_srates_ie(sdata, skb, false);

		ieee80211_add_ext_srates_ie(sdata, skb, false);

		ieee80211_tdls_add_ext_capab(skb);

		break;

	case WLAN_TDLS_SETUP_CONFIRM:
@@ -2740,8 +2740,8 @@ ieee80211_prep_tdls_direct(struct wiphy *wiphy, struct net_device *dev, 
		mgmt->u.action.u.tdls_discover_resp.capability =

			cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata));



		ieee80211_add_srates_ie(&sdata->vif, skb, false);

		ieee80211_add_ext_srates_ie(&sdata->vif, skb, false);

		ieee80211_add_srates_ie(sdata, skb, false);

		ieee80211_add_ext_srates_ie(sdata, skb, false);

		ieee80211_tdls_add_ext_capab(skb);

		break;

	default:

net/mac80211/ieee80211_i.h

+4 −0
Original line number Diff line number Diff line
@@ -1480,6 +1480,10 @@ u8 *ieee80211_ie_build_ht_oper(u8 *pos, struct ieee80211_sta_ht_cap *ht_cap, 
			       struct ieee80211_channel *channel,

			       enum nl80211_channel_type channel_type,

			       u16 prot_mode);

int ieee80211_add_srates_ie(struct ieee80211_sub_if_data *sdata,

			    struct sk_buff *skb, bool need_basic);

int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata,

				struct sk_buff *skb, bool need_basic);



/* channel management */

enum ieee80211_chan_mode {

net/mac80211/mesh_plink.c

+2 −2
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 
			pos = skb_put(skb, 2);

			memcpy(pos + 2, &plid, 2);

		}

		if (ieee80211_add_srates_ie(&sdata->vif, skb, true) ||

		    ieee80211_add_ext_srates_ie(&sdata->vif, skb, true) ||

		if (ieee80211_add_srates_ie(sdata, skb, true) ||

		    ieee80211_add_ext_srates_ie(sdata, skb, true) ||

		    mesh_add_rsn_ie(skb, sdata) ||

		    mesh_add_meshid_ie(skb, sdata) ||

		    mesh_add_meshconf_ie(skb, sdata))

net/mac80211/tx.c

+2 −2
Original line number Diff line number Diff line
@@ -2420,9 +2420,9 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, 
		*pos++ = WLAN_EID_SSID;

		*pos++ = 0x0;



		if (ieee80211_add_srates_ie(&sdata->vif, skb, true) ||

		if (ieee80211_add_srates_ie(sdata, skb, true) ||

		    mesh_add_ds_params_ie(skb, sdata) ||

		    ieee80211_add_ext_srates_ie(&sdata->vif, skb, true) ||

		    ieee80211_add_ext_srates_ie(sdata, skb, true) ||

		    mesh_add_rsn_ie(skb, sdata) ||

		    mesh_add_ht_cap_ie(skb, sdata) ||

		    mesh_add_ht_oper_ie(skb, sdata) ||