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

Commit 76708dee authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

mac80211: free up 2 bytes in skb->cb 



Free up 2 bytes in skb->cb to be used for multi-rate retry later.
Move iv_len and icv_len initialization into key alloc.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 417bd25a

drivers/net/wireless/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) 


	if (info->control.hw_key) {

		keyidx = info->control.hw_key->hw_key_idx;

		pktlen += info->control.icv_len;

		pktlen += info->control.hw_key->icv_len;

	}

	ret = ah->ah_setup_tx_desc(ah, ds, pktlen,

		ieee80211_get_hdrlen_from_skb(skb), AR5K_PKT_TYPE_NORMAL,

drivers/net/wireless/ath9k/xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int ath_tx_prepare(struct ath_softc *sc, 


	if (tx_info->control.hw_key) {

		txctl->keyix = tx_info->control.hw_key->hw_key_idx;

		txctl->frmlen += tx_info->control.icv_len;

		txctl->frmlen += tx_info->control.hw_key->icv_len;



		if (tx_info->control.hw_key->alg == ALG_WEP)

			txctl->keytype = ATH9K_KEY_TYPE_WEP;

drivers/net/wireless/b43/xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, 
		}



		/* Hardware appends ICV. */

		plcp_fragment_len += info->control.icv_len;

		plcp_fragment_len += info->control.hw_key->icv_len;



		key_idx = b43_kidx_to_fw(dev, key_idx);

		mac_ctl |= (key_idx << B43_TXH_MAC_KEYIDX_SHIFT) &
@@ -260,7 +260,7 @@ int b43_generate_txhdr(struct b43_wldev *dev, 
		mac_ctl |= (key->algorithm << B43_TXH_MAC_KEYALG_SHIFT) &

			   B43_TXH_MAC_KEYALG;

		wlhdr_len = ieee80211_hdrlen(fctl);

		iv_len = min((size_t) info->control.iv_len,

		iv_len = min((size_t) info->control.hw_key->iv_len,

			     ARRAY_SIZE(txhdr->iv));

		memcpy(txhdr->iv, ((u8 *) wlhdr) + wlhdr_len, iv_len);

	}

drivers/net/wireless/b43legacy/xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, 


		if (key->enabled) {

			/* Hardware appends ICV. */

			plcp_fragment_len += info->control.icv_len;

			plcp_fragment_len += info->control.hw_key->icv_len;



			key_idx = b43legacy_kidx_to_fw(dev, key_idx);

			mac_ctl |= (key_idx << B43legacy_TX4_MAC_KEYIDX_SHIFT) &
@@ -252,7 +252,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev, 
				   B43legacy_TX4_MAC_KEYALG_SHIFT) &

				   B43legacy_TX4_MAC_KEYALG;

			wlhdr_len = ieee80211_hdrlen(wlhdr->frame_control);

			iv_len = min((size_t)info->control.iv_len,

			iv_len = min((size_t)info->control.hw_key->iv_len,

				     ARRAY_SIZE(txhdr->iv));

			memcpy(txhdr->iv, ((u8 *)wlhdr) + wlhdr_len, iv_len);

		} else {

drivers/net/wireless/rt2x00/rt2x00crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info) 
	 * note that these lengths should only be added when

	 * mac80211 does not generate it.

	 */

	overhead += tx_info->control.icv_len;

	overhead += key->icv_len;



	if (!(key->flags & IEEE80211_KEY_FLAG_GENERATE_IV))

		overhead += tx_info->control.iv_len;

		overhead += key->iv_len;



	if (!(key->flags & IEEE80211_KEY_FLAG_GENERATE_MMIC)) {

		if (key->alg == ALG_TKIP)