[lkml]   [2012]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subjectlinux-next: build failure after merge of the wireless-next tree
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 <>
Date: Thu, 12 Apr 2012 12:21:01 +1000
Subject: [PATCH] cfg80211: NLA_PUT_U32 api change merge fix

Signed-off-by: Stephen Rothwell <>
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,

- 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);

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-04-12 04:27    [W:0.022 / U:1.348 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site