---

yaml --- r: 352606 b: refs/heads/master c: de66efc h: refs/heads/master v: v3
git-mirror · Feb 8, 2013 · 260a335 · 260a335
1 parent ddfab1d
commit 260a335
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33a6b157f80af5e2a98a244b3dfff650bc5c7bcc
+refs/heads/master: de66efcadbb51935c8c668a38f2f1c187f349af9
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -132,12 +132,10 @@ static int brcmf_p2p_set_firmware(struct brcmf_p2p_info *p2p)
  */
 static void brcmf_p2p_generate_bss_mac(struct brcmf_p2p_info *p2p)
 {
-	struct net_device *ndev = cfg_to_ndev(p2p->cfg);
-
 	/* Generate the P2P Device Address.  This consists of the device's
 	 * primary MAC address with the locally administered bit set.
 	 */
-	memcpy(p2p->dev_addr, ndev->dev_addr, ETH_ALEN);
+	memcpy(p2p->dev_addr, p2p->cfg->pub->mac, ETH_ALEN);
 	p2p->dev_addr[0] |= 0x02;
 
 	/* Generate the P2P Interface Address.  If the discovery and connection