On Wed, Sep 17, 2008 at 3:10 PM, Luis R. Rodriguez
<[EMAIL PROTECTED]> wrote:
> On Wed, Sep 17, 2008 at 03:05:59AM -0700, Partha Bagchi wrote:
>> Hi All,
>>
>> I download compat-wireless-2.6-old and compiled and installed it on a
>> Fedora 9 box. Here are the details:
>>
>> lspci > 06:00.0 Network controller: Atheros Communications Inc.
>> Unknown device 002a (rev 01)
>> uname -a > Linux Bordeaux 2.6.26.3-29.fc9.i686 #1 SMP Wed Sep 3
>> 03:42:27 EDT 2008 i686 i686 i386 GNU/Linux
>
> Please try appling the patch titled:
>
> "[PATCH] ath9k: connectivity is lost after Group rekeying is done"
>
> which was posted on linux-wireless. If that fixes your issue I can merge
> this patch on compat-wireless-old. I've attached the patch for your
> convenience, inline at the bottom and also as an attachment.
>
> Luis
>
>
> From [EMAIL PROTECTED] Wed Sep 17 00:10:07 2008
>
> Connectivtiy is lost after Group rekeying is done. The keytype
> maintained by ath9k is reset when group key is updated. Though
> sc_keytype can be reset only for broadcast key the proper fix
> would be to use mac80211 provided key type from txinfo during
> xmit and get rid of sc_keytype from ath9k ath_softc.
>
> Signed-off-by: Vasanthakumar Thiagarajan <[EMAIL PROTECTED]>
> Signed-off-by: Senthil Balasubramanian <[EMAIL PROTECTED]>
> ---
> drivers/net/wireless/ath9k/core.h | 1 -
> drivers/net/wireless/ath9k/main.c | 3 ---
> drivers/net/wireless/ath9k/xmit.c | 6 +++---
> 3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k=
> /core.h
> index b66de29..e8ccbe4 100644
> --- a/drivers/net/wireless/ath9k/core.h
> +++ b/drivers/net/wireless/ath9k/core.h
> @@ -976,7 +976,6 @@ struct ath_softc {
> u32 sc_keymax; /* size of key cache */
> DECLARE_BITMAP(sc_keymap, ATH_KEYMAX); /* key use bit map */
> u8 sc_splitmic; /* split TKIP MIC keys */
> - int sc_keytype;
>
> /* RX */
> struct list_head sc_rxbuf;
> diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k=
> /main.c
> index 1ba1800..aca893a 100644
> --- a/drivers/net/wireless/ath9k/main.c
> +++ b/drivers/net/wireless/ath9k/main.c
> @@ -204,8 +204,6 @@ static int ath_key_config(struct ath_softc *sc,
> if (!ret)
> return -EIO;
>
> - if (mac)
> - sc->sc_keytype =3D hk.kv_type;
> return 0;
> }
>
> @@ -1507,7 +1505,6 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
> case DISABLE_KEY:
> ath_key_delete(sc, key);
> clear_bit(key->keyidx, sc->sc_keymap);
> - sc->sc_keytype =3D ATH9K_CIPHER_CLR;
> break;
> default:
> ret =3D -EINVAL;
> diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k=
> /xmit.c
> index 3fc6641..2592905 100644
> --- a/drivers/net/wireless/ath9k/xmit.c
> +++ b/drivers/net/wireless/ath9k/xmit.c
> @@ -239,11 +239,11 @@ static int ath_tx_prepare(struct ath_softc *sc,
> txctl->keyix =3D tx_info->control.hw_key->hw_key_idx;
> txctl->frmlen +=3D tx_info->control.icv_len;
>
> - if (sc->sc_keytype =3D=3D ATH9K_CIPHER_WEP)
> + if (tx_info->control.hw_key->alg =3D=3D ALG_WEP)
> txctl->keytype =3D ATH9K_KEY_TYPE_WEP;
> - else if (sc->sc_keytype =3D=3D ATH9K_CIPHER_TKIP)
> + else if (tx_info->control.hw_key->alg =3D=3D ALG_TKIP)
> txctl->keytype =3D ATH9K_KEY_TYPE_TKIP;
> - else if (sc->sc_keytype =3D=3D ATH9K_CIPHER_AES_CCM)
> + else if (tx_info->control.hw_key->alg =3D=3D ALG_CCMP)
> txctl->keytype =3D ATH9K_KEY_TYPE_AES;
> }
>
> --
> 1.5.5
>
>
>
Luis,
Thanks for the patch. The patch did not apply, I got all rejected
hunks when I applied it to the source
compat-wireless-2.6-old/drivers/net/wireless/ath9k
Here are the error messages:
Bordeaux > patch -p1 < connectivity.patch
patching file drivers/net/wireless/ath9k/core.h
Hunk #1 FAILED at 976.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/net/wireless/ath9k/core.h.rej
patching file drivers/net/wireless/ath9k/main.c
Hunk #1 FAILED at 204.
Hunk #2 FAILED at 1505
2 out of 2 hunks FAILED -- saving rejects to file
drivers/net/wireless/ath9k/main.c.rej
patching file drivers/net/wireless/ath9k/xmit.c
Hunk #1 FAILED at 239.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/net/wireless/ath9k/xmit.c.rej
When I looked at the source, I could see that the patch could not work
since the line numbers are not right. I even tried it on a freshly
downloaded source from
http://wireless.kernel.org/download/compat-wireless-2.6/compat-wireless-old.tar.bz2
I am not sure what to do.
Thanks for your help!
Partha
_______________________________________________
ath9k-devel mailing list
[email protected]
https://lists.ath9k.org/mailman/listinfo/ath9k-devel
