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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20110519110221.dbb8c524.sfr@canb.auug.org.au>
Date:	Thu, 19 May 2011 11:02:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Pirko <jpirko@...hat.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Javier Lopez <jlopex@...il.com>
Subject: linux-next: manual merge of the wireless tree with the net tree

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/mac80211_hwsim.c between commit 1c5cae815d19 ("net:
call dev_alloc_name from register_netdevice") from the net tree and
commit 444c7896bf5b ("mac80211_hwsim driver support userspace frame
tx/rx") from the wireless tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/wireless/mac80211_hwsim.c
index 9d4a40e,d8ec575..0000000
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@@ -1519,8 -1880,23 +1878,16 @@@ static int __init init_mac80211_hwsim(v
  	if (err < 0)
  		goto failed_mon;
  
 -
 -	err = register_netdevice(hwsim_mon);
 -	if (err < 0)
 -		goto failed_mon;
 -
 -	rtnl_unlock();
 -
+ 	err = hwsim_init_netlink();
+ 	if (err < 0)
+ 		goto failed_nl;
+ 
  	return 0;
  
+ failed_nl:
+ 	printk(KERN_DEBUG "mac80211_hwsim: failed initializing netlink\n");
+ 	return err;
+ 
  failed_mon:
  	rtnl_unlock();
  	free_netdev(hwsim_mon);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html