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

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

mac80211: make station management completely depend on vif 



The station management currently uses the virtual
interface, but you cannot add the same station to
multiple virtual interfaces if you're communicating
with it in multiple ways.

This restriction should be lifted so that in the
future we can, for instance, support bluetooth 3
with an access point that mac80211 is already
associated to.

We can do that by requiring all sta_info_get users
to provide the virtual interface and making the RX
code aware that an address may match more than one
station struct. Thanks to the previous patches this
one isn't all that large and except for the RX and
TX status paths changes has low complexity.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 15920d8a

net/mac80211/agg-rx.c

+1 −2
Original line number Diff line number Diff line
@@ -83,12 +83,11 @@ void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, 
void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid,

					u16 initiator, u16 reason)

{

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;



	rcu_read_lock();



	sta = sta_info_get(local, ra);

	sta = sta_info_get(sdata, ra);

	if (!sta) {

		rcu_read_unlock();

		return;

net/mac80211/agg-tx.c

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) 
	}



	rcu_read_lock();

	sta = sta_info_get(local, ra);

	sta = sta_info_get(sdata, ra);

	if (!sta) {

		rcu_read_unlock();

#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -564,7 +564,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) 
#endif /* CONFIG_MAC80211_HT_DEBUG */



	rcu_read_lock();

	sta = sta_info_get(local, ra);

	sta = sta_info_get(sdata, ra);

	if (!sta) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Could not find station: %pM\n", ra);

net/mac80211/cfg.c

+10 −15
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	rcu_read_lock();



	if (mac_addr) {

		sta = sta_info_get(sdata->local, mac_addr);

		sta = sta_info_get(sdata, mac_addr);

		if (!sta) {

			ieee80211_key_free(key);

			err = -ENOENT;
@@ -181,7 +181,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev, 
	if (mac_addr) {

		ret = -ENOENT;



		sta = sta_info_get(sdata->local, mac_addr);

		sta = sta_info_get(sdata, mac_addr);

		if (!sta)

			goto out_unlock;
@@ -228,7 +228,7 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, 
	rcu_read_lock();



	if (mac_addr) {

		sta = sta_info_get(sdata->local, mac_addr);

		sta = sta_info_get(sdata, mac_addr);

		if (!sta)

			goto out;
@@ -414,15 +414,13 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev, 
static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,

				 u8 *mac, struct station_info *sinfo)

{

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct sta_info *sta;

	int ret = -ENOENT;



	rcu_read_lock();



	/* XXX: verify sta->dev == dev */



	sta = sta_info_get(local, mac);

	sta = sta_info_get(sdata, mac);

	if (sta) {

		ret = 0;

		sta_set_sinfo(sta, sinfo);
@@ -778,8 +776,7 @@ static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev, 
	if (mac) {

		rcu_read_lock();



		/* XXX: get sta belonging to dev */

		sta = sta_info_get(local, mac);

		sta = sta_info_get(sdata, mac);

		if (!sta) {

			rcu_read_unlock();

			return -ENOENT;
@@ -800,14 +797,14 @@ static int ieee80211_change_station(struct wiphy *wiphy, 
				    u8 *mac,

				    struct station_parameters *params)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct sta_info *sta;

	struct ieee80211_sub_if_data *vlansdata;



	rcu_read_lock();



	/* XXX: get sta belonging to dev */

	sta = sta_info_get(local, mac);

	sta = sta_info_get(sdata, mac);

	if (!sta) {

		rcu_read_unlock();

		return -ENOENT;
@@ -846,7 +843,6 @@ static int ieee80211_change_station(struct wiphy *wiphy, 
static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev,

				 u8 *dst, u8 *next_hop)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct ieee80211_sub_if_data *sdata;

	struct mesh_path *mpath;

	struct sta_info *sta;
@@ -855,7 +851,7 @@ static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev, 
	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	rcu_read_lock();

	sta = sta_info_get(local, next_hop);

	sta = sta_info_get(sdata, next_hop);

	if (!sta) {

		rcu_read_unlock();

		return -ENOENT;
@@ -894,7 +890,6 @@ static int ieee80211_change_mpath(struct wiphy *wiphy, 
				    struct net_device *dev,

				    u8 *dst, u8 *next_hop)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct ieee80211_sub_if_data *sdata;

	struct mesh_path *mpath;

	struct sta_info *sta;
@@ -903,7 +898,7 @@ static int ieee80211_change_mpath(struct wiphy *wiphy, 


	rcu_read_lock();



	sta = sta_info_get(local, next_hop);

	sta = sta_info_get(sdata, next_hop);

	if (!sta) {

		rcu_read_unlock();

		return -ENOENT;

net/mac80211/ibss.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 


		rcu_read_lock();



		sta = sta_info_get(local, mgmt->sa);

		sta = sta_info_get(sdata, mgmt->sa);

		if (sta) {

			u32 prev_rates;

net/mac80211/key.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ void ieee80211_key_link(struct ieee80211_key *key, 
			 */



			/* same here, the AP could be using QoS */

			ap = sta_info_get(key->local, key->sdata->u.mgd.bssid);

			ap = sta_info_get(key->sdata, key->sdata->u.mgd.bssid);

			if (ap) {

				if (test_sta_flags(ap, WLAN_STA_WME))

					key->conf.flags |=