diff mbox

rt2x00: Fix compilation without CONFIG_RT2X00_LIB_CRYPTO

Message ID CAGXE3d9ynyJX2eAr2bfwOc_PdDNEwVHDVsA_Jx1ReBht=eVuYw@mail.gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Helmut Schaa Aug. 2, 2011, 9:43 a.m. UTC
This was introduced by commit
77b5621bac4a56b83b9081f48d4e7d1accdde400 (rt2x00: Don't use queue entry
as parameter when creating TX descriptor.)

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
---
Sending directly to John as I assume this should go through the wireless tree?

 drivers/net/wireless/rt2x00/rt2x00lib.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

 {
 }

Comments

Gertjan van Wingerde Aug. 2, 2011, 9:46 a.m. UTC | #1
On Tue, Aug 2, 2011 at 11:43 AM, Helmut Schaa
<helmut.schaa@googlemail.com> wrote:
> This was introduced by commit
> 77b5621bac4a56b83b9081f48d4e7d1accdde400 (rt2x00: Don't use queue entry
> as parameter when creating TX descriptor.)
>
> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

OK. You beat me to it.

Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>

> ---
> Sending directly to John as I assume this should go through the wireless tree?
>
>  drivers/net/wireless/rt2x00/rt2x00lib.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h
> b/drivers/net/wireless/rt2x00/rt2x00lib.h
> index 15cdc7e..4cdf247 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00lib.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
> @@ -355,7 +355,8 @@ static inline enum cipher
> rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *
>        return CIPHER_NONE;
>  }
>
> -static inline void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
> +static inline void rt2x00crypto_create_tx_descriptor(struct
> rt2x00_dev *rt2x00dev,
> +                                                    struct sk_buff *skb,
>                                                     struct txentry_desc *txdesc)
>  {
>  }
> --
> 1.7.3.4
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Ivo van Doorn Aug. 2, 2011, 9:48 a.m. UTC | #2
On Tue, Aug 2, 2011 at 11:43 AM, Helmut Schaa
<helmut.schaa@googlemail.com> wrote:
> This was introduced by commit
> 77b5621bac4a56b83b9081f48d4e7d1accdde400 (rt2x00: Don't use queue entry
> as parameter when creating TX descriptor.)
>
> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

Acked-by: Ivo van Doorn <IvDoorn@gmail.com>

> ---
> Sending directly to John as I assume this should go through the wireless tree?
>
>  drivers/net/wireless/rt2x00/rt2x00lib.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h
> b/drivers/net/wireless/rt2x00/rt2x00lib.h
> index 15cdc7e..4cdf247 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00lib.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
> @@ -355,7 +355,8 @@ static inline enum cipher
> rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *
>        return CIPHER_NONE;
>  }
>
> -static inline void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
> +static inline void rt2x00crypto_create_tx_descriptor(struct
> rt2x00_dev *rt2x00dev,
> +                                                    struct sk_buff *skb,
>                                                     struct txentry_desc *txdesc)
>  {
>  }
> --
> 1.7.3.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Randy Dunlap Aug. 2, 2011, 5:10 p.m. UTC | #3
On Tue, 2 Aug 2011 11:43:14 +0200 Helmut Schaa wrote:

> This was introduced by commit
> 77b5621bac4a56b83b9081f48d4e7d1accdde400 (rt2x00: Don't use queue entry
> as parameter when creating TX descriptor.)
> 
> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.

> ---
> Sending directly to John as I assume this should go through the wireless tree?
> 
>  drivers/net/wireless/rt2x00/rt2x00lib.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h
> b/drivers/net/wireless/rt2x00/rt2x00lib.h
> index 15cdc7e..4cdf247 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00lib.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
> @@ -355,7 +355,8 @@ static inline enum cipher
> rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *
>  	return CIPHER_NONE;
>  }
> 
> -static inline void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
> +static inline void rt2x00crypto_create_tx_descriptor(struct
> rt2x00_dev *rt2x00dev,
> +						     struct sk_buff *skb,
>  						     struct txentry_desc *txdesc)
>  {
>  }
> -- 


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h
b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 15cdc7e..4cdf247 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -355,7 +355,8 @@  static inline enum cipher
rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *
 	return CIPHER_NONE;
 }

-static inline void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,
+static inline void rt2x00crypto_create_tx_descriptor(struct
rt2x00_dev *rt2x00dev,
+						     struct sk_buff *skb,
 						     struct txentry_desc *txdesc)