[PATCH 1/2] wl12xx: leave IV calculation to HW for CCMP

[PATCH 1/2] wl12xx: leave IV calculation to HW for CCMP

[Arik Nemtsov]

Use an appropriate mac80211 flags in CCMP keys to indicate we are
calculating the CCMP IV in HW, but require room for the IV to be reserved
in the skb. The space is reserved by mac80211.

depends on "mac80211: support adding IV-room in the skb for CCMP keys".

Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
 drivers/net/wireless/wl12xx/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index f76be5a..75adc76 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2992,7 +2992,7 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 	case WLAN_CIPHER_SUITE_CCMP:
 		key_type = KEY_AES;
 
-		key_conf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+		key_conf->flags |= IEEE80211_KEY_FLAG_PUT_IV_SPACE;
 		tx_seq_32 = WL1271_TX_SECURITY_HI32(wlvif->tx_security_seq);
 		tx_seq_16 = WL1271_TX_SECURITY_LO16(wlvif->tx_security_seq);
 		break;
-- 
1.7.5.4

[PATCH 2/2] wl12xx: handle idle changes per-interface

[Arik Nemtsov]

From: Eliad Peller <eliad@wizery.com>

Idle changes are currently handled per hardware.
However, some operations should be done only per-interface.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
 drivers/net/wireless/wl12xx/main.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 75adc76..b65816d 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2540,13 +2540,6 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 		}
 	}
 
-	if (changed & IEEE80211_CONF_CHANGE_IDLE && !is_ap) {
-		ret = wl1271_sta_handle_idle(wl, wlvif,
-					conf->flags & IEEE80211_CONF_IDLE);
-		if (ret < 0)
-			wl1271_warning("idle mode change failed %d", ret);
-	}
-
 	/*
 	 * if mac80211 changes the PSM mode, make sure the mode is not
 	 * incorrectly changed after the pspoll failure active window.
@@ -3619,6 +3612,12 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 		do_join = true;
 	}
 
+	if (changed & BSS_CHANGED_IDLE) {
+		ret = wl1271_sta_handle_idle(wl, wlvif, bss_conf->idle);
+		if (ret < 0)
+			wl1271_warning("idle mode change failed %d", ret);
+	}
+
 	if ((changed & BSS_CHANGED_CQM)) {
 		bool enable = false;
 		if (bss_conf->cqm_rssi_thold)
-- 
1.7.5.4

Re: [PATCH 2/2] wl12xx: handle idle changes per-interface

[Luciano Coelho]

On Sun, 2011-10-23 at 08:21 +0200, Arik Nemtsov wrote: 
> From: Eliad Peller <eliad@wizery.com>
> 
> Idle changes are currently handled per hardware.
> However, some operations should be done only per-interface.
> 
> Signed-off-by: Eliad Peller <eliad@wizery.com>
> Signed-off-by: Arik Nemtsov <arik@wizery.com>
> ---

Applied this patch.  1/2 from this same set is still pending a
dependency and will be applied later.

-- 
Cheers,
Luca.

Re: [PATCH 1/2] wl12xx: leave IV calculation to HW for CCMP

[Luciano Coelho]

On Sun, 2011-10-23 at 08:21 +0200, Arik Nemtsov wrote: 
> Use an appropriate mac80211 flags in CCMP keys to indicate we are
> calculating the CCMP IV in HW, but require room for the IV to be reserved
> in the skb. The space is reserved by mac80211.
> 
> depends on "mac80211: support adding IV-room in the skb for CCMP keys".
> 
> Signed-off-by: Arik Nemtsov <arik@wizery.com>
> ---

Applied.


-- 
Cheers,
Luca.