All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	Jouni Malinen <jouni@qca.qualcomm.com>
Subject: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Wed, 28 Sep 2011 13:19:17 +1000	[thread overview]
Message-ID: <20110928131917.fe58aa3efa5549a9b3a6e3da@canb.auug.org.au> (raw)

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
net/wireless/nl80211.c between commit 1b9ca0272ffa ("cfg80211: Fix
validation of AKM suites") from the wireless-current tree and commit
6d30240e3d68 ("cfg80211: Remove strict validation of AKM suites") from
the wireless tree.

The latter seems to make the former partly unneccessary, so I used that
(see below).

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

diff --cc net/wireless/nl80211.c
index 1b79a56,bf3fc4f..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -4304,14 -4300,7 +4300,10 @@@ static int nl80211_crypto_settings(stru
  		if (len % sizeof(u32))
  			return -EINVAL;
  
 +		if (settings->n_akm_suites > NL80211_MAX_NR_AKM_SUITES)
 +			return -EINVAL;
 +
  		memcpy(settings->akm_suites, data, len);
- 
- 		for (i = 0; i < settings->n_akm_suites; i++)
- 			if (!nl80211_valid_akm_suite(settings->akm_suites[i]))
- 				return -EINVAL;
  	}
  
  	return 0;

             reply	other threads:[~2011-09-28  3:19 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28  3:19 Stephen Rothwell [this message]
2011-09-28  9:10 ` linux-next: manual merge of the wireless tree with the wireless-current tree Jouni Malinen
2011-09-28  9:10   ` Jouni Malinen
  -- strict thread matches above, loose matches on Subject: below --
2011-09-14  3:05 Stephen Rothwell
2011-06-21  1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
2011-04-05  2:21 Stephen Rothwell
2011-04-05  2:21 Stephen Rothwell
2010-12-14  2:22 Stephen Rothwell
2010-08-30  1:58 Stephen Rothwell
2010-04-09  1:05 Stephen Rothwell
2010-04-07  2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31   ` Stephen Rothwell
2010-04-07 23:19   ` David Miller
2010-04-01  1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
2010-03-11  2:15 Stephen Rothwell
2010-03-11  2:38 ` Bruno Randolf
2010-03-11  3:04   ` Stephen Rothwell
2010-02-23  1:26 Stephen Rothwell
2009-11-24  3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
2009-07-09  1:40 Stephen Rothwell
2009-04-22  1:32 Stephen Rothwell
2009-04-22 18:23 ` reinette chatre
2009-04-22 18:38   ` John W. Linville
2009-02-19  5:27 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110928131917.fe58aa3efa5549a9b3a6e3da@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=jouni@qca.qualcomm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.