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

Commit ab1f5c0b authored by Rami Rosen's avatar Rami Rosen Committed by John W. Linville
Browse files

mac80211: misc cleanups 



This patch removes unneeded member (skbuff) from
ieee80211_ibss_add_sta() method in its declaration (in ieee80211_i.h)
and its callers (in rx.c and mlme.c)

This patch removes unneeded member from struct ieee80211_rx_data
in ieee80211_i.h.

(Originally posted as two patches. -- JWL)

Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4dec9b80

net/mac80211/ieee80211_i.h

+1 −3
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ struct ieee80211_rx_data { 
	struct ieee80211_rx_status *status;

	struct ieee80211_rate *rate;



	u16 ethertype;

	unsigned int flags;

	int sent_ps_buffered;

	int queue;
@@ -864,8 +863,7 @@ int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid); 
void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata,

			    struct ieee80211_if_sta *ifsta);

struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,

					struct sk_buff *skb, u8 *bssid,

					u8 *addr, u64 supp_rates);

					u8 *bssid, u8 *addr, u64 supp_rates);

int ieee80211_sta_deauthenticate(struct ieee80211_sub_if_data *sdata, u16 reason);

int ieee80211_sta_disassociate(struct ieee80211_sub_if_data *sdata, u16 reason);

u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata);

net/mac80211/mlme.c

+3 −7
Original line number Diff line number Diff line
@@ -1565,8 +1565,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
				    (unsigned long long) sta->sta.supp_rates[band]);

#endif

		} else {

			ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid,

					       mgmt->sa, supp_rates);

			ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates);

		}



		rcu_read_unlock();
@@ -1638,9 +1637,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
			       sdata->dev->name, mgmt->bssid);

#endif

			ieee80211_sta_join_ibss(sdata, &sdata->u.sta, bss);

			ieee80211_ibss_add_sta(sdata, NULL,

					       mgmt->bssid, mgmt->sa,

					       supp_rates);

			ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates);

		}

	}
@@ -2373,8 +2370,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata) 
 * must be callable in atomic context.

 */

struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,

					struct sk_buff *skb, u8 *bssid,

					u8 *addr, u64 supp_rates)

					u8 *bssid,u8 *addr, u64 supp_rates)

{

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;

net/mac80211/rx.c

+2 −3
Original line number Diff line number Diff line
@@ -1850,8 +1850,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, 
				return 0;

			rx->flags &= ~IEEE80211_RX_RA_MATCH;

		} else if (!rx->sta)

			rx->sta = ieee80211_ibss_add_sta(sdata, rx->skb,

						bssid, hdr->addr2,

			rx->sta = ieee80211_ibss_add_sta(sdata, bssid, hdr->addr2,

				BIT(rx->status->rate_idx));

		break;

	case NL80211_IFTYPE_MESH_POINT: