netdev - linux-next: manual merge of the wireless-next tree with the net-next 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: <20120201133950.ece9e39bba11f943e4724014@canb.auug.org.au>
Date:	Wed, 1 Feb 2012 13:39:50 +1100
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,
	Joe Perches <joe@...ches.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 net-next tree

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/rtlwifi/rtl8192se/sw.c between commit e404decb0fb0
("drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages") from the
net-next tree and commit f30d7507a811 ("rtlwifi: Convert RT_TRACE macro
to use ##__VA_ARGS__") from the wireless-next tree.

The former removed the code modified by the latter, so I did that (see
below).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 36140cc,ca38dd9..0000000
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@@ -186,9 -226,14 +226,11 @@@ static int rtl92s_init_sw_vars(struct i
  
  	/* for firmware buf */
  	rtlpriv->rtlhal.pfirmware = vzalloc(sizeof(struct rt_firmware));
 -	if (!rtlpriv->rtlhal.pfirmware) {
 -		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 -			 "Can't alloc buffer for fw\n");
 +	if (!rtlpriv->rtlhal.pfirmware)
  		return 1;
 -	}
  
+ 	rtlpriv->max_fw_size = sizeof(struct rt_firmware);
+ 
  	pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
  		"Loading firmware %s\n", rtlpriv->cfg->fw_name);
  	/* request fw */

Content of type "application/pgp-signature" skipped