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

Commit cf966838 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: use switch statement in tx code 



The transmit code needs to set the addresses depending on the
interface type, a likely() for AP/VLAN is quite wrong since
most people will be using STA; convert to a switch statement
to make it look nicer.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb063c17

net/mac80211/tx.c

+11 −6
Original line number Original line Diff line number Diff line
@@ -1363,15 +1363,17 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, 
	/* TODO: handling for 802.1x authorized/unauthorized port */

	/* TODO: handling for 802.1x authorized/unauthorized port */

	fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;

	fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;





	if (likely(sdata->type == IEEE80211_IF_TYPE_AP ||

	switch (sdata->type) {

		   sdata->type == IEEE80211_IF_TYPE_VLAN)) {

	case IEEE80211_IF_TYPE_AP:

	case IEEE80211_IF_TYPE_VLAN:

		fc |= IEEE80211_FCTL_FROMDS;

		fc |= IEEE80211_FCTL_FROMDS;

		/* DA BSSID SA */

		/* DA BSSID SA */

		memcpy(hdr.addr1, skb->data, ETH_ALEN);

		memcpy(hdr.addr1, skb->data, ETH_ALEN);

		memcpy(hdr.addr2, dev->dev_addr, ETH_ALEN);

		memcpy(hdr.addr2, dev->dev_addr, ETH_ALEN);

		memcpy(hdr.addr3, skb->data + ETH_ALEN, ETH_ALEN);

		memcpy(hdr.addr3, skb->data + ETH_ALEN, ETH_ALEN);

		hdrlen = 24;

		hdrlen = 24;

	} else if (sdata->type == IEEE80211_IF_TYPE_WDS) {

		break;

	case IEEE80211_IF_TYPE_WDS:

		fc |= IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS;

		fc |= IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS;

		/* RA TA DA SA */

		/* RA TA DA SA */

		memcpy(hdr.addr1, sdata->u.wds.remote_addr, ETH_ALEN);

		memcpy(hdr.addr1, sdata->u.wds.remote_addr, ETH_ALEN);
@@ -1379,20 +1381,23 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, 
		memcpy(hdr.addr3, skb->data, ETH_ALEN);

		memcpy(hdr.addr3, skb->data, ETH_ALEN);

		memcpy(hdr.addr4, skb->data + ETH_ALEN, ETH_ALEN);

		memcpy(hdr.addr4, skb->data + ETH_ALEN, ETH_ALEN);

		hdrlen = 30;

		hdrlen = 30;

	} else if (sdata->type == IEEE80211_IF_TYPE_STA) {

		break;

	case IEEE80211_IF_TYPE_STA:

		fc |= IEEE80211_FCTL_TODS;

		fc |= IEEE80211_FCTL_TODS;

		/* BSSID SA DA */

		/* BSSID SA DA */

		memcpy(hdr.addr1, sdata->u.sta.bssid, ETH_ALEN);

		memcpy(hdr.addr1, sdata->u.sta.bssid, ETH_ALEN);

		memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);

		memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);

		memcpy(hdr.addr3, skb->data, ETH_ALEN);

		memcpy(hdr.addr3, skb->data, ETH_ALEN);

		hdrlen = 24;

		hdrlen = 24;

	} else if (sdata->type == IEEE80211_IF_TYPE_IBSS) {

		break;

	case IEEE80211_IF_TYPE_IBSS:

		/* DA SA BSSID */

		/* DA SA BSSID */

		memcpy(hdr.addr1, skb->data, ETH_ALEN);

		memcpy(hdr.addr1, skb->data, ETH_ALEN);

		memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);

		memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);

		memcpy(hdr.addr3, sdata->u.sta.bssid, ETH_ALEN);

		memcpy(hdr.addr3, sdata->u.sta.bssid, ETH_ALEN);

		hdrlen = 24;

		hdrlen = 24;

	} else {

		break;

	default:

		ret = 0;

		ret = 0;

		goto fail;

		goto fail;

	}

	}