linux-next: manual merge of the wireless-next tree with the net-next tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Pontus Fuchs <pontus.fuchs@gmail.com>
Subject: linux-next: manual merge of the wireless-next tree with the net-next tree
Date: Mon, 16 Apr 2012 12:49:02 +1000	[thread overview]
Message-ID: <20120416124902.26193e1af5e5177cc91f5df8@canb.auug.org.au> (raw)

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

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
net/wireless/nl80211.c between commit 9360ffd18597 ("wireless: Stop using
NLA_PUT*()") from the net-next tree and commit d91df0e3a1b9 ("cfg80211:
Add channel information to NL80211_CMD_GET_INTERFACE") from the
wireless-next tree.

I applied this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Apr 2012 12:45:25 +1000
Subject: [PATCH] cfg80211: fix up for NLA_PUT_ api changes

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

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b33a852..acae9d4 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1546,10 +1546,11 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags,
 
 		chan = rdev->ops->get_channel(&rdev->wiphy, &channel_type);
 		if (chan) {
-			NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ,
-				    chan->center_freq);
-			NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-				    channel_type);
+			if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
+					chan->center_freq) ||
+			    nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+					channel_type))
+				goto nla_put_failure;
 		}
 	}
 
-- 
1.7.10.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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