Subject: Re: [PATCH 10/17] wireless: update gfp/slab.h includes

From: Stephen Rothwell <[email-masked]>
Date: Wed, 19 May 2010 19:02:30 +1000

Hi John,

On Tue, 30 Mar 2010 02:52:38 +0900 Tejun Heo <[email-masked]> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
> gfp.h or slab.h is included as necessary.
> 
> Signed-off-by: Tejun Heo <[email-masked]>
> Cc: Stephen Rothwell <[email-masked]>
> Cc: John W. Linville <[email-masked]>
> ---
>  drivers/net/wireless/ath/ath9k/htc.h       |    1 +
>  drivers/net/wireless/iwlwifi/iwl-agn-ict.c |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
> index 7770649..4497479 100644
> --- a/drivers/net/wireless/ath/ath9k/htc.h
> +++ b/drivers/net/wireless/ath/ath9k/htc.h
> @@ -23,6 +23,7 @@
>  #include <linux/skbuff.h>
>  #include <linux/netdevice.h>
>  #include <linux/leds.h>
> +#include <linux/slab.h>
>  #include <net/mac80211.h>
>  
>  #include "common.h"
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
> index 4c5395e..0cc7fd9 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
> @@ -30,6 +30,7 @@
>  #include <linux/module.h>
>  #include <linux/etherdevice.h>
>  #include <linux/sched.h>
> +#include <linux/gfp.h>
>  #include <net/mac80211.h>
>  
>  #include "iwl-dev.h"

I think that this patch is still needed in the wireless tree and I notice
that Dave has asked Linus to pull the net tree (containing the wireless
tree).  I have been carrying this in linux-next.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/