linux-kernel - linux-next: manual merge of the staging tree with the wireless 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100222163134.367353e7.sfr@canb.auug.org.au>
Date:	Mon, 22 Feb 2010 16:31:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Frederic Leroy <fredo@...rox.org>,
	"John W. Linville" <linville@...driver.com>,
	Joe Perches <joe@...ches.com>
Subject: linux-next: manual merge of the staging tree with the wireless tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c between commit
e2117cea27c6b27e1a379acac5eb0433eeb7033a ("staging: rtl8192su: fix
compile error from wireless-testing commit") from the wireless tree and
commit 7332868b1aea2a5900a70acadf767f7632b1c2c2 ("Staging: rtl8187x: Use %
pM for mac address output") from the staging 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/staging/rtl8192su/ieee80211/ieee80211_rx.c
index 095b8c6,67b99ad..0000000
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
@@@ -2366,11 -2366,11 +2366,11 @@@ static inline void ieee80211_process_pr
  		(beacon->capability & (1<<0x0)) ? '1' : '0');
  
  	if (ieee80211_network_init(ieee, beacon, &network, stats)) {
- 		IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
+ 		IEEE80211_DEBUG_SCAN("Dropped '%s' (%pM) via %s.\n",
  				     escape_essid(info_element->data,
  						  info_element->len),
- 				     MAC_ARG(beacon->header.addr3),
+ 				     beacon->header.addr3,
 -				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
 +				     WLAN_FC_GET_STYPE(beacon->header.frame_control) ==
  				     IEEE80211_STYPE_PROBE_RESP ?
  				     "PROBE RESPONSE" : "BEACON");
  		return;
@@@ -2492,11 -2492,11 +2492,11 @@@
  
  
  #ifdef CONFIG_IEEE80211_DEBUG
- 		IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",
+ 		IEEE80211_DEBUG_SCAN("Adding '%s' (%pM) via %s.\n",
  				     escape_essid(network.ssid,
  						  network.ssid_len),
- 				     MAC_ARG(network.bssid),
+ 				     network.bssid,
 -				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
 +				     WLAN_FC_GET_STYPE(beacon->header.frame_control) ==
  				     IEEE80211_STYPE_PROBE_RESP ?
  				     "PROBE RESPONSE" : "BEACON");
  #endif
@@@ -2505,11 -2505,11 +2505,11 @@@
  		if(ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)
  			ieee80211_softmac_new_net(ieee,&network);
  	} else {
- 		IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",
+ 		IEEE80211_DEBUG_SCAN("Updating '%s' (%pM) via %s.\n",
  				     escape_essid(target->ssid,
  						  target->ssid_len),
- 				     MAC_ARG(target->bssid),
+ 				     target->bssid,
 -				     WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
 +				     WLAN_FC_GET_STYPE(beacon->header.frame_control) ==
  				     IEEE80211_STYPE_PROBE_RESP ?
  				     "PROBE RESPONSE" : "BEACON");
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/