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,
Jouni Malinen <jouni.malinen@atheros•com>,
Sukesh Srikakula <sukeshs@broadcom•com>,
Arend van Spriel <arend@broadcom•com>
Subject: linux-next: manual merge of the staging tree with the wireless tree
Date: Wed, 18 May 2011 12:56:33 +1000 [thread overview]
Message-ID: <20110518125633.0164cb32.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c between commit
5a083c0aba95 ("cfg80211: Use consistent BSS matching between scan and
sme") from the wireless tree and commit e494632efcd9 ("staging:
brcm80211: Fixed bss (re)connect/disconnect issues in brcmfmac driver")
from the staging tree.
I fixed it up (see below) anc can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 7aaf99c,e3b409b..0000000
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@@ -2627,17 -2863,20 +2863,19 @@@ wl_bss_roaming_done(struct wl_priv *wl
struct wl_connect_info *conn_info = wl_to_conn(wl);
s32 err = 0;
+ WL_TRACE("Enter\n");
+
wl_get_assoc_ies(wl);
- memcpy(&wl->bssid, &e->addr, ETH_ALEN);
+ wl_update_prof(wl, NULL, &e->addr, WL_PROF_BSSID);
wl_update_bss_info(wl);
-
- cfg80211_roamed(ndev,
+ cfg80211_roamed(ndev, NULL,
- (u8 *)&wl->bssid,
+ (u8 *)wl_read_prof(wl, WL_PROF_BSSID),
conn_info->req_ie, conn_info->req_ie_len,
conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
- WL_DBG("Report roaming result\n");
+ WL_CONN("Report roaming result\n");
set_bit(WL_STATUS_CONNECTED, &wl->status);
-
+ WL_TRACE("Exit\n");
return err;
}
next reply other threads:[~2011-05-18 2:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-18 2:56 Stephen Rothwell [this message]
2011-05-18 5:09 ` linux-next: manual merge of the staging tree with the wireless tree Greg KH
2011-05-18 18:53 ` Sukesh Srikakula
-- 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
2010-02-22 5:31 Stephen Rothwell
2010-02-24 2:14 ` Greg KH
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=20110518125633.0164cb32.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arend@broadcom$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=jouni.malinen@atheros$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sukeshs@broadcom$(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