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

[PATCH] mac80211: remove ieee80211_set_aid_for_sta 



Remove ieee80211_set_aid_for_sta and associated code.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7f8c0598

include/net/mac80211.h

+0 −6
Original line number Diff line number Diff line
@@ -921,12 +921,6 @@ struct sk_buff * 
ieee80211_get_buffered_bc(struct ieee80211_hw *hw, int if_id,

			  struct ieee80211_tx_control *control);



/* Low level drivers that have their own MLME and MAC indicate

 * the aid for an associating station with this call */

int ieee80211_set_aid_for_sta(struct ieee80211_hw *hw,

			      u8 *peer_address, u16 aid);





/* Given an sk_buff with a raw 802.11 header at the data pointer this function

 * returns the 802.11 header length in bytes (not including encryption

 * headers). If the data in the sk_buff is too short to contain a valid 802.11

net/mac80211/ieee80211.c

+0 −28
Original line number Diff line number Diff line
@@ -3165,34 +3165,6 @@ int ieee80211_radar_status(struct ieee80211_hw *hw, int channel, 
}

EXPORT_SYMBOL(ieee80211_radar_status);



int ieee80211_set_aid_for_sta(struct ieee80211_hw *hw, u8 *peer_address,

			      u16 aid)

{

	struct sk_buff *skb;

	struct ieee80211_msg_set_aid_for_sta *msg;

	struct ieee80211_local *local = hw_to_local(hw);



	/* unlikely because if this event only happens for APs,

	 * which require an open ap device. */

	if (unlikely(!local->apdev))

		return 0;



	skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) +

			    sizeof(struct ieee80211_msg_set_aid_for_sta));



	if (!skb)

		return -ENOMEM;

	skb_reserve(skb, sizeof(struct ieee80211_frame_info));



	msg = (struct ieee80211_msg_set_aid_for_sta *)

		skb_put(skb, sizeof(struct ieee80211_msg_set_aid_for_sta));

	memcpy(msg->sta_address, peer_address, ETH_ALEN);

	msg->aid = aid;



	ieee80211_rx_mgmt(local, skb, NULL, ieee80211_msg_set_aid_for_sta);

	return 0;

}

EXPORT_SYMBOL(ieee80211_set_aid_for_sta);



static void ap_sta_ps_start(struct net_device *dev, struct sta_info *sta)

{

net/mac80211/ieee80211_common.h

+1 −6
Original line number Diff line number Diff line
@@ -52,16 +52,11 @@ enum ieee80211_msg_type { 
	ieee80211_msg_michael_mic_failure = 5,

	/* hole at 6, was monitor but never sent to userspace */

	ieee80211_msg_sta_not_assoc = 7,

	ieee80211_msg_set_aid_for_sta = 8 /* used by Intersil MVC driver */,

	/* 8 was ieee80211_msg_set_aid_for_sta */

	ieee80211_msg_key_threshold_notification = 9,

	ieee80211_msg_radar = 11,

};



struct ieee80211_msg_set_aid_for_sta {

	char	sta_address[ETH_ALEN];

	u16	aid;

};



struct ieee80211_msg_key_notification {

	int tx_rx_count;

	char ifname[IFNAMSIZ];