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

Commit 9352c19f authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: extend get_tkip_seq to all keys 



Extend the function to read the TKIP IV32/IV16 to read the IV/PN for
all ciphers in order to allow drivers with full hardware crypto to
properly support this.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f603f1f3

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+0 −1
Original line number Diff line number Diff line
@@ -798,7 +798,6 @@ const struct ieee80211_ops ath5k_hw_ops = { 
	.sw_scan_start		= ath5k_sw_scan_start,

	.sw_scan_complete	= ath5k_sw_scan_complete,

	.get_stats		= ath5k_get_stats,

	/* .get_tkip_seq	= not implemented */

	/* .set_frag_threshold	= not implemented */

	/* .set_rts_threshold	= not implemented */

	/* .sta_add		= not implemented */

drivers/net/wireless/rt2x00/rt2800lib.c

+10 −6
Original line number Diff line number Diff line
@@ -7817,21 +7817,25 @@ EXPORT_SYMBOL_GPL(rt2800_probe_hw); 
/*

 * IEEE80211 stack callback functions.

 */

void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, u32 *iv32,

			 u16 *iv16)

void rt2800_get_key_seq(struct ieee80211_hw *hw,

			struct ieee80211_key_conf *key,

			struct ieee80211_key_seq *seq)

{

	struct rt2x00_dev *rt2x00dev = hw->priv;

	struct mac_iveiv_entry iveiv_entry;

	u32 offset;



	offset = MAC_IVEIV_ENTRY(hw_key_idx);

	if (key->cipher != WLAN_CIPHER_SUITE_TKIP)

		return;



	offset = MAC_IVEIV_ENTRY(key->hw_key_idx);

	rt2800_register_multiread(rt2x00dev, offset,

				      &iveiv_entry, sizeof(iveiv_entry));



	memcpy(iv16, &iveiv_entry.iv[0], sizeof(*iv16));

	memcpy(iv32, &iveiv_entry.iv[4], sizeof(*iv32));

	memcpy(&seq->tkip.iv16, &iveiv_entry.iv[0], 2);

	memcpy(&seq->tkip.iv32, &iveiv_entry.iv[4], 4);

}

EXPORT_SYMBOL_GPL(rt2800_get_tkip_seq);

EXPORT_SYMBOL_GPL(rt2800_get_key_seq);



int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value)

{

drivers/net/wireless/rt2x00/rt2800lib.h

+3 −2
Original line number Diff line number Diff line
@@ -209,8 +209,9 @@ int rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev); 


int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev);



void rt2800_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, u32 *iv32,

			 u16 *iv16);

void rt2800_get_key_seq(struct ieee80211_hw *hw,

			struct ieee80211_key_conf *key,

			struct ieee80211_key_seq *seq);

int rt2800_set_rts_threshold(struct ieee80211_hw *hw, u32 value);

int rt2800_conf_tx(struct ieee80211_hw *hw,

		   struct ieee80211_vif *vif, u16 queue_idx,

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static const struct ieee80211_ops rt2800pci_mac80211_ops = { 
	.sw_scan_start		= rt2x00mac_sw_scan_start,

	.sw_scan_complete	= rt2x00mac_sw_scan_complete,

	.get_stats		= rt2x00mac_get_stats,

	.get_tkip_seq		= rt2800_get_tkip_seq,

	.get_key_seq		= rt2800_get_key_seq,

	.set_rts_threshold	= rt2800_set_rts_threshold,

	.sta_add		= rt2x00mac_sta_add,

	.sta_remove		= rt2x00mac_sta_remove,

drivers/net/wireless/rt2x00/rt2800soc.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static const struct ieee80211_ops rt2800soc_mac80211_ops = { 
	.sw_scan_start		= rt2x00mac_sw_scan_start,

	.sw_scan_complete	= rt2x00mac_sw_scan_complete,

	.get_stats		= rt2x00mac_get_stats,

	.get_tkip_seq		= rt2800_get_tkip_seq,

	.get_key_seq		= rt2800_get_key_seq,

	.set_rts_threshold	= rt2800_set_rts_threshold,

	.sta_add		= rt2x00mac_sta_add,

	.sta_remove		= rt2x00mac_sta_remove,