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

Commit f698d856 authored by Jasper Bryant-Greene's avatar Jasper Bryant-Greene Committed by John W. Linville
Browse files

replace net_device arguments with ieee80211_{local,sub_if_data} as appropriate 



This patch replaces net_device arguments to mac80211 internal functions
with ieee80211_{local,sub_if_data} as appropriate.

It also does the same for many 802.11s mesh functions, and changes the
mesh path table to be indexed on sub_if_data rather than net_device.

If the mesh part needs to be a separate patch let me know, but since
mesh uses a lot of mac80211 functions which were being converted anyway,
the changes go hand-in-hand somewhat.

This patch probably does not convert all the functions which could be
converted, but it is a large chunk and followup patches will be
provided.

Signed-off-by: default avatarJasper Bryant-Greene <jasper@amiton.co.nz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fef1643b

net/mac80211/cfg.c

+13 −8
Original line number Diff line number Diff line
@@ -66,13 +66,16 @@ static int ieee80211_add_iface(struct wiphy *wiphy, char *name, 
static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)

{

	struct net_device *dev;

	struct ieee80211_sub_if_data *sdata;



	/* we're under RTNL */

	dev = __dev_get_by_index(&init_net, ifindex);

	if (!dev)

		return -ENODEV;



	ieee80211_if_remove(dev);

	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	ieee80211_if_remove(sdata);



	return 0;

}
@@ -842,13 +845,13 @@ static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev, 
		return -ENOENT;

	}



	err = mesh_path_add(dst, dev);

	err = mesh_path_add(dst, sdata);

	if (err) {

		rcu_read_unlock();

		return err;

	}



	mpath = mesh_path_lookup(dst, dev);

	mpath = mesh_path_lookup(dst, sdata);

	if (!mpath) {

		rcu_read_unlock();

		return -ENXIO;
@@ -862,10 +865,12 @@ static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev, 
static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev,

				 u8 *dst)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (dst)

		return mesh_path_del(dst, dev);

		return mesh_path_del(dst, sdata);



	mesh_path_flush(dev);

	mesh_path_flush(sdata);

	return 0;

}
@@ -897,7 +902,7 @@ static int ieee80211_change_mpath(struct wiphy *wiphy, 
		return -ENOENT;

	}



	mpath = mesh_path_lookup(dst, dev);

	mpath = mesh_path_lookup(dst, sdata);

	if (!mpath) {

		rcu_read_unlock();

		return -ENOENT;
@@ -965,7 +970,7 @@ static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev, 
		return -ENOTSUPP;



	rcu_read_lock();

	mpath = mesh_path_lookup(dst, dev);

	mpath = mesh_path_lookup(dst, sdata);

	if (!mpath) {

		rcu_read_unlock();

		return -ENOENT;
@@ -993,7 +998,7 @@ static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev, 
		return -ENOTSUPP;



	rcu_read_lock();

	mpath = mesh_path_lookup_by_idx(idx, dev);

	mpath = mesh_path_lookup_by_idx(idx, sdata);

	if (!mpath) {

		rcu_read_unlock();

		return -ENOENT;

net/mac80211/debugfs_sta.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static ssize_t sta_agg_status_write(struct file *file, 
		tid_num = tid_num - 100;

		if (tid_static_rx[tid_num] == 1) {

			strcpy(state, "off ");

			ieee80211_sta_stop_rx_ba_session(dev, da, tid_num, 0,

			ieee80211_sta_stop_rx_ba_session(sta->sdata, da, tid_num, 0,

					WLAN_REASON_QSTA_REQUIRE_SETUP);

			sta->ampdu_mlme.tid_state_rx[tid_num] |=

					HT_AGG_STATE_DEBUGFS_CTL;

net/mac80211/event.c

+2 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * mac80211 - events

 */



#include <linux/netdevice.h>

#include <net/iw_handler.h>

#include "ieee80211_i.h"
@@ -17,7 +16,7 @@ 
 * (in the variable hdr) must be long enough to extract the TKIP

 * fields like TSC

 */

void mac80211_ev_michael_mic_failure(struct net_device *dev, int keyidx,

void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,

				     struct ieee80211_hdr *hdr)

{

	union iwreq_data wrqu;
@@ -32,7 +31,7 @@ void mac80211_ev_michael_mic_failure(struct net_device *dev, int keyidx, 
			print_mac(mac, hdr->addr2));

		memset(&wrqu, 0, sizeof(wrqu));

		wrqu.data.length = strlen(buf);

		wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);

		wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);

		kfree(buf);

	}

net/mac80211/ieee80211_i.h

+24 −24
Original line number Diff line number Diff line
@@ -851,65 +851,65 @@ u32 ieee80211_handle_ht(struct ieee80211_local *local, int enable_ht, 


/* ieee80211_ioctl.c */

extern const struct iw_handler_def ieee80211_iw_handler_def;

int ieee80211_set_freq(struct net_device *dev, int freq);

int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freq);



/* ieee80211_sta.c */

void ieee80211_sta_timer(unsigned long data);

void ieee80211_sta_work(struct work_struct *work);

void ieee80211_sta_scan_work(struct work_struct *work);

void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb,

void ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,

			   struct ieee80211_rx_status *rx_status);

int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len);

int ieee80211_sta_get_ssid(struct net_device *dev, char *ssid, size_t *len);

int ieee80211_sta_set_bssid(struct net_device *dev, u8 *bssid);

int ieee80211_sta_req_scan(struct net_device *dev, u8 *ssid, size_t ssid_len);

void ieee80211_sta_req_auth(struct net_device *dev,

int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len);

int ieee80211_sta_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len);

int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid);

int ieee80211_sta_req_scan(struct ieee80211_sub_if_data *sdata, u8 *ssid, size_t ssid_len);

void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata,

			    struct ieee80211_if_sta *ifsta);

int ieee80211_sta_scan_results(struct net_device *dev,

int ieee80211_sta_scan_results(struct ieee80211_local *local,

			       struct iw_request_info *info,

			       char *buf, size_t len);

ieee80211_rx_result ieee80211_sta_rx_scan(

	struct net_device *dev, struct sk_buff *skb,

	struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,

	struct ieee80211_rx_status *rx_status);

void ieee80211_rx_bss_list_init(struct ieee80211_local *local);

void ieee80211_rx_bss_list_deinit(struct ieee80211_local *local);

int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len);

struct sta_info *ieee80211_ibss_add_sta(struct net_device *dev,

int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, char *ie, size_t len);

struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,

					struct sk_buff *skb, u8 *bssid,

					u8 *addr, u64 supp_rates);

int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason);

int ieee80211_sta_disassociate(struct net_device *dev, u16 reason);

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

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

void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,

				      u32 changed);

u32 ieee80211_reset_erp_info(struct net_device *dev);

u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata);

int ieee80211_ht_cap_ie_to_ht_info(struct ieee80211_ht_cap *ht_cap_ie,

				   struct ieee80211_ht_info *ht_info);

int ieee80211_ht_addt_info_ie_to_ht_bss_info(

			struct ieee80211_ht_addt_info *ht_add_info_ie,

			struct ieee80211_ht_bss_info *bss_info);

void ieee80211_send_addba_request(struct net_device *dev, const u8 *da,

void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata, const u8 *da,

				  u16 tid, u8 dialog_token, u16 start_seq_num,

				  u16 agg_size, u16 timeout);

void ieee80211_send_delba(struct net_device *dev, const u8 *da, u16 tid,

void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, const u8 *da, u16 tid,

				u16 initiator, u16 reason_code);

void ieee80211_send_bar(struct net_device *dev, u8 *ra, u16 tid, u16 ssn);

void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u16 ssn);



void ieee80211_sta_stop_rx_ba_session(struct net_device *dev, u8 *da,

void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *da,

				u16 tid, u16 initiator, u16 reason);

void sta_addba_resp_timer_expired(unsigned long data);

void ieee80211_sta_tear_down_BA_sessions(struct net_device *dev, u8 *addr);

void ieee80211_sta_tear_down_BA_sessions(struct ieee80211_sub_if_data *sdata, u8 *addr);

u64 ieee80211_sta_get_rates(struct ieee80211_local *local,

			    struct ieee802_11_elems *elems,

			    enum ieee80211_band band);

void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb,

void ieee80211_sta_tx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,

		int encrypt);

void ieee802_11_parse_elems(u8 *start, size_t len,

				   struct ieee802_11_elems *elems);



#ifdef CONFIG_MAC80211_MESH

void ieee80211_start_mesh(struct net_device *dev);

void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);

#else

static inline void ieee80211_start_mesh(struct net_device *dev)

static inline void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)

{}

#endif
@@ -920,7 +920,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, 
		     struct vif_params *params);

int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,

			     enum ieee80211_if_types type);

void ieee80211_if_remove(struct net_device *dev);

void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata);

void ieee80211_remove_interfaces(struct ieee80211_local *local);



/* tx handling */
@@ -938,7 +938,7 @@ u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, 
			enum ieee80211_if_types type);

int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,

			     int rate, int erp, int short_preamble);

void mac80211_ev_michael_mic_failure(struct net_device *dev, int keyidx,

void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,

				     struct ieee80211_hdr *hdr);



#ifdef CONFIG_MAC80211_NOINLINE

net/mac80211/iface.c

+3 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void ieee80211_teardown_sdata(struct net_device *dev) 
	case IEEE80211_IF_TYPE_MESH_POINT:

		/* Allow compiler to elide mesh_rmc_free call. */

		if (ieee80211_vif_is_mesh(&sdata->vif))

			mesh_rmc_free(dev);

			mesh_rmc_free(sdata);

		/* fall through */

	case IEEE80211_IF_TYPE_STA:

	case IEEE80211_IF_TYPE_IBSS:
@@ -241,15 +241,13 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, 
	return ret;

}



void ieee80211_if_remove(struct net_device *dev)

void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	ASSERT_RTNL();



	list_del_rcu(&sdata->list);

	synchronize_rcu();

	unregister_netdevice(dev);

	unregister_netdevice(sdata->dev);

}



/*