linux-kernel - RE: 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-prev] [day] [month] [year] [list]

Message-ID: <400C43189542CE41BC0A5B252FC901369670F0AD03@SJEXCHCCR02.corp.ad.broadcom.com>
Date:	Wed, 18 May 2011 11:53:22 -0700
From:	"Sukesh Srikakula" <sukeshs@...adcom.com>
To:	"Stephen Rothwell" <sfr@...b.auug.org.au>,
	"Greg KH" <greg@...ah.com>
cc:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Jouni Malinen" <jouni.malinen@...eros.com>,
	"Arend Van Spriel" <arend@...adcom.com>
Subject: RE: linux-next: manual merge of the staging tree with the
 wireless tree

Hi Stephen,

Thanks for merging. 
Merge looks to be fine.

Regards,
Sukesh.

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@...b.auug.org.au] 
Sent: Tuesday, May 17, 2011 7:57 PM
To: Greg KH
Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; Jouni Malinen; Sukesh Srikakula; Arend Van Spriel
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/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@...b.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;
  }
  


--
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/