linux-next: build failure after merge of the wireless-next tree

linux-next: build failure after merge of the wireless-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]

Hi John,

After merging the wireless-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

net/wireless/nl80211.c: In function 'nl80211_ch_switch_notify':
net/wireless/nl80211.c:8060:2: error: implicit declaration of function 'NLA_PUT_U32' [-Werror=implicit-function-declaration]

Caused by commit 5314526b1743 ("cfg80211: add channel switch notify
event") interacting with commit 9360ffd18597 ("wireless: Stop using
NLA_PUT*()") from the net-next tree.

I added the following merge fix patch.

John, you may like to cherry-pick that commit from Dave's tree (or back
merge that part of Dave's tree or get Dave to merge you tree and start
further work on top of the merge).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Apr 2012 12:21:01 +1000
Subject: [PATCH] cfg80211: NLA_PUT_U32 api change merge fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/wireless/nl80211.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f727a1f..f7d2ebb 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -8057,9 +8057,12 @@ void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev,
 		return;
 	}
 
-	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
-	NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
-	NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, type);
+	if (nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex))
+		goto nla_put_failure;
+	if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq))
+		goto nla_put_failure;
+	if (nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, type))
+		goto nla_put_failure;
 
 	genlmsg_end(msg, hdr);
 
-- 
1.7.10.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the wireless-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2002 bytes --]

Hi Dave,

On Mon, 8 Sep 2014 18:42:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi John,
> 
> After merging the wireless-next tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/wireless/ath/ath5k/debug.c: In function 'open_file_eeprom':
> drivers/net/wireless/ath/ath5k/debug.c:933:2: error: implicit declaration of function 'vmalloc' [-Werror=implicit-function-declaration]
>   buf = vmalloc(eesize);
>   ^
> drivers/net/wireless/ath/ath5k/debug.c:933:6: warning: assignment makes pointer from integer without a cast
>   buf = vmalloc(eesize);
>       ^
> drivers/net/wireless/ath/ath5k/debug.c:960:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
>   vfree(buf);
>   ^
> 
> Caused by commit db906eb2101b ("ath5k: added debugfs file for dumping
> eeprom").  Also reported by Guenter Roeck.
> 
> I have used Geert Uytterhoeven's suggested fix of including vmalloc.h
> and so added this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Sep 2014 18:39:23 +1000
> Subject: [PATCH] ath5k: fix debugfs addition
> 
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/ath/ath5k/debug.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
> index 30e4e1fd4b04..399728618fb9 100644
> --- a/drivers/net/wireless/ath/ath5k/debug.c
> +++ b/drivers/net/wireless/ath/ath5k/debug.c
> @@ -62,6 +62,7 @@
>  
>  #include <linux/export.h>
>  #include <linux/moduleparam.h>
> +#include <linux/vmalloc.h>
>  
>  #include <linux/seq_file.h>
>  #include <linux/list.h>
> -- 
> 2.1.0

This fix patch is now needed in the net-next tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the wireless-next tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Sep 2014 09:28:19 +1000

> Hi Dave,
 ...
> This fix patch is now needed in the net-next tree ...

Applied thanks Stephen.

Re: linux-next: build failure after merge of the wireless-next tree

[John W. Linville]

On Tue, Sep 09, 2014 at 04:37:33PM -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 10 Sep 2014 09:28:19 +1000
> 
> > Hi Dave,
>  ...
> > This fix patch is now needed in the net-next tree ...
> 
> Applied thanks Stephen.

Doh!  Sorry I missed that one...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.