From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Frederic Leroy <fredo@starox•org>,
"John W. Linville" <linville@tuxdriver•com>,
Joe Perches <joe@perches•com>
Subject: linux-next: manual merge of the staging tree with the wireless tree
Date: Mon, 22 Feb 2010 16:31:34 +1100 [thread overview]
Message-ID: <20100222163134.367353e7.sfr@canb.auug.org.au> (raw)
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@canb•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");
next reply other threads:[~2010-02-22 5:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-22 5:31 Stephen Rothwell [this message]
2010-02-24 2:14 ` linux-next: manual merge of the staging tree with the wireless tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2011-03-02 6:27 Stephen Rothwell
2011-03-02 14:26 ` Greg KH
2011-03-02 15:39 ` Arend van Spriel
2011-05-18 2:56 Stephen Rothwell
2011-05-18 5:09 ` Greg KH
2011-05-18 18:53 ` Sukesh Srikakula
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=20100222163134.367353e7.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=fredo@starox$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox