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

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

mac80211: reduce reliance on netdev 



For bluetooth 3, we will most likely not have
a netdev for a virtual interface (sdata), so
prepare for that by reducing the reliance on
having a netdev. This patch moves the name
and address fields into the sdata struct and
uses them from there all over. Some work is
needed to keep them sync'ed, but that's not
a lot of work and in slow paths anyway.

In doing so, this also reduces the number of
pointer dereferences in many places, because
of things like sdata->dev->dev_addr becoming
sdata->vif.addr.

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

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -659,12 +659,14 @@ struct ieee80211_conf { 
 * @type: type of this virtual interface

 * @bss_conf: BSS configuration for this interface, either our own

 *	or the BSS we're associated to

 * @addr: address of this interface

 * @drv_priv: data area for driver use, will always be aligned to

 *	sizeof(void *).

 */

struct ieee80211_vif {

	enum nl80211_iftype type;

	struct ieee80211_bss_conf bss_conf;

	u8 addr[ETH_ALEN];

	/* must be last */

	u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));

};

net/mac80211/agg-rx.c

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *d 


	if (!skb) {

		printk(KERN_DEBUG "%s: failed to allocate buffer "

		       "for addba resp frame\n", sdata->dev->name);

		       "for addba resp frame\n", sdata->name);

		return;

	}
@@ -143,10 +143,10 @@ static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *d 
	mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);

	memset(mgmt, 0, 24);

	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);

	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);

	if (sdata->vif.type == NL80211_IFTYPE_AP ||

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

		memcpy(mgmt->bssid, sdata->dev->dev_addr, ETH_ALEN);

		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);

net/mac80211/agg-tx.c

+7 −7
Original line number Diff line number Diff line
@@ -58,17 +58,17 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata, 


	if (!skb) {

		printk(KERN_ERR "%s: failed to allocate buffer "

				"for addba request frame\n", sdata->dev->name);

				"for addba request frame\n", sdata->name);

		return;

	}

	skb_reserve(skb, local->hw.extra_tx_headroom);

	mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);

	memset(mgmt, 0, 24);

	memcpy(mgmt->da, da, ETH_ALEN);

	memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);

	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);

	if (sdata->vif.type == NL80211_IFTYPE_AP ||

	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

		memcpy(mgmt->bssid, sdata->dev->dev_addr, ETH_ALEN);

		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);

	else if (sdata->vif.type == NL80211_IFTYPE_STATION)

		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
@@ -104,7 +104,7 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1 
	skb = dev_alloc_skb(sizeof(*bar) + local->hw.extra_tx_headroom);

	if (!skb) {

		printk(KERN_ERR "%s: failed to allocate buffer for "

			"bar frame\n", sdata->dev->name);

			"bar frame\n", sdata->name);

		return;

	}

	skb_reserve(skb, local->hw.extra_tx_headroom);
@@ -113,7 +113,7 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1 
	bar->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL |

					 IEEE80211_STYPE_BACK_REQ);

	memcpy(bar->ra, ra, ETH_ALEN);

	memcpy(bar->ta, sdata->dev->dev_addr, ETH_ALEN);

	memcpy(bar->ta, sdata->vif.addr, ETH_ALEN);

	bar_control |= (u16)IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL;

	bar_control |= (u16)IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA;

	bar_control |= (u16)(tid << 12);
@@ -489,7 +489,7 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, 
#ifdef CONFIG_MAC80211_HT_DEBUG

		if (net_ratelimit())

			printk(KERN_WARNING "%s: Not enough memory, "

			       "dropping start BA session", skb->dev->name);

			       "dropping start BA session", sdata->name);

#endif

		return;

	}
@@ -621,7 +621,7 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, 
#ifdef CONFIG_MAC80211_HT_DEBUG

		if (net_ratelimit())

			printk(KERN_WARNING "%s: Not enough memory, "

			       "dropping stop BA session", skb->dev->name);

			       "dropping stop BA session", sdata->name);

#endif

		return;

	}

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 
	} else

		sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	if (compare_ether_addr(mac, dev->dev_addr) == 0)

	if (compare_ether_addr(mac, sdata->vif.addr) == 0)

		return -EINVAL;



	if (is_multicast_ether_addr(mac))

net/mac80211/debugfs_key.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ KEY_CONF_FILE(keyidx, D); 
KEY_CONF_FILE(hw_key_idx, D);

KEY_FILE(flags, X);

KEY_FILE(tx_rx_count, D);

KEY_READ(ifindex, sdata->dev->ifindex, 20, "%d\n");

KEY_READ(ifindex, sdata->name, IFNAMSIZ + 2, "%s\n");

KEY_OPS(ifindex);



static ssize_t key_algorithm_read(struct file *file,