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

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

mac80211: pull mgmt frame rx into rx handler 



Some code is duplicated between ibss, mesh and
managed mode regarding the queueing of management
frames. Since all modes now use a common skb
queue and a common work function, we can pull
the queueing code into the rx handler directly
and remove the duplicated length checks etc.

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

net/mac80211/ibss.c

+0 −26
Original line number Diff line number Diff line
@@ -847,32 +847,6 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local) 
	mutex_unlock(&local->iflist_mtx);

}



ieee80211_rx_result

ieee80211_ibss_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_mgmt *mgmt;

	u16 fc;



	if (skb->len < 24)

		return RX_DROP_MONITOR;



	mgmt = (struct ieee80211_mgmt *) skb->data;

	fc = le16_to_cpu(mgmt->frame_control);



	switch (fc & IEEE80211_FCTL_STYPE) {

	case IEEE80211_STYPE_PROBE_RESP:

	case IEEE80211_STYPE_BEACON:

	case IEEE80211_STYPE_PROBE_REQ:

	case IEEE80211_STYPE_AUTH:

		skb_queue_tail(&sdata->skb_queue, skb);

		ieee80211_queue_work(&local->hw, &sdata->work);

		return RX_QUEUED;

	}



	return RX_DROP_MONITOR;

}



int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,

			struct cfg80211_ibss_params *params)

{

net/mac80211/ieee80211_i.h

+0 −4
Original line number Diff line number Diff line
@@ -981,8 +981,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, 
int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,

			   struct cfg80211_disassoc_request *req,

			   void *cookie);

ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata,

					  struct sk_buff *skb);

void ieee80211_send_pspoll(struct ieee80211_local *local,

			   struct ieee80211_sub_if_data *sdata);

void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency);
@@ -1002,8 +1000,6 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
/* IBSS code */

void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);

void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata);

ieee80211_rx_result

ieee80211_ibss_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);

struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,

					u8 *bssid, u8 *addr, u32 supp_rates,

					gfp_t gfp);

net/mac80211/mesh.c

+0 −25
Original line number Diff line number Diff line
@@ -702,28 +702,3 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) 
	INIT_LIST_HEAD(&ifmsh->preq_queue.list);

	spin_lock_init(&ifmsh->mesh_preq_queue_lock);

}
 


ieee80211_rx_result

ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_mgmt *mgmt;

	u16 fc;



	if (skb->len < 24)

		return RX_DROP_MONITOR;



	mgmt = (struct ieee80211_mgmt *) skb->data;

	fc = le16_to_cpu(mgmt->frame_control);



	switch (fc & IEEE80211_FCTL_STYPE) {

	case IEEE80211_STYPE_ACTION:

	case IEEE80211_STYPE_PROBE_RESP:

	case IEEE80211_STYPE_BEACON:

		skb_queue_tail(&sdata->skb_queue, skb);

		ieee80211_queue_work(&local->hw, &sdata->work);

		return RX_QUEUED;

	}



	return RX_CONTINUE;

}

net/mac80211/mesh.h

+0 −2
Original line number Diff line number Diff line
@@ -237,8 +237,6 @@ void ieee80211s_update_metric(struct ieee80211_local *local, 
		struct sta_info *stainfo, struct sk_buff *skb);

void ieee80211s_stop(void);

void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);

ieee80211_rx_result

ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);

void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);

void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata);

void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh);

net/mac80211/mlme.c

+0 −27
Original line number Diff line number Diff line
@@ -1633,33 +1633,6 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
	ieee80211_bss_info_change_notify(sdata, changed);

}



ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata,

					  struct sk_buff *skb)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_mgmt *mgmt;

	u16 fc;



	if (skb->len < 24)

		return RX_DROP_MONITOR;



	mgmt = (struct ieee80211_mgmt *) skb->data;

	fc = le16_to_cpu(mgmt->frame_control);



	switch (fc & IEEE80211_FCTL_STYPE) {

	case IEEE80211_STYPE_PROBE_RESP:

	case IEEE80211_STYPE_BEACON:

	case IEEE80211_STYPE_DEAUTH:

	case IEEE80211_STYPE_DISASSOC:

	case IEEE80211_STYPE_ACTION:

		skb_queue_tail(&sdata->skb_queue, skb);

		ieee80211_queue_work(&local->hw, &sdata->work);

		return RX_QUEUED;

	}



	return RX_DROP_MONITOR;

}



void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,

				  struct sk_buff *skb)

{