|
@@ -1243,7 +1243,7 @@ bool brcmf_p2p_scan_finding_common_channel(struct brcmf_cfg80211_info *cfg,
|
|
IEEE80211_P2P_ATTR_DEVICE_ID,
|
|
IEEE80211_P2P_ATTR_DEVICE_ID,
|
|
p2p_dev_addr, sizeof(p2p_dev_addr));
|
|
p2p_dev_addr, sizeof(p2p_dev_addr));
|
|
if ((err >= 0) &&
|
|
if ((err >= 0) &&
|
|
- (!memcmp(p2p_dev_addr, afx_hdl->tx_dst_addr, ETH_ALEN))) {
|
|
|
|
|
|
+ (ether_addr_equal(p2p_dev_addr, afx_hdl->tx_dst_addr))) {
|
|
if (!bi->ctl_ch) {
|
|
if (!bi->ctl_ch) {
|
|
ch.chspec = le16_to_cpu(bi->chanspec);
|
|
ch.chspec = le16_to_cpu(bi->chanspec);
|
|
cfg->d11inf.decchspec(&ch);
|
|
cfg->d11inf.decchspec(&ch);
|
|
@@ -1380,8 +1380,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,
|
|
(brcmf_p2p_gon_req_collision(p2p, (u8 *)e->addr))) {
|
|
(brcmf_p2p_gon_req_collision(p2p, (u8 *)e->addr))) {
|
|
if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
|
|
if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
|
|
&p2p->status) &&
|
|
&p2p->status) &&
|
|
- (memcmp(afx_hdl->tx_dst_addr, e->addr,
|
|
|
|
- ETH_ALEN) == 0)) {
|
|
|
|
|
|
+ (ether_addr_equal(afx_hdl->tx_dst_addr, e->addr))) {
|
|
afx_hdl->peer_chan = ch.chnum;
|
|
afx_hdl->peer_chan = ch.chnum;
|
|
brcmf_dbg(INFO, "GON request: Peer found, channel=%d\n",
|
|
brcmf_dbg(INFO, "GON request: Peer found, channel=%d\n",
|
|
afx_hdl->peer_chan);
|
|
afx_hdl->peer_chan);
|
|
@@ -1865,7 +1864,7 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,
|
|
cfg->d11inf.decchspec(&ch);
|
|
cfg->d11inf.decchspec(&ch);
|
|
|
|
|
|
if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, &p2p->status) &&
|
|
if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, &p2p->status) &&
|
|
- (memcmp(afx_hdl->tx_dst_addr, e->addr, ETH_ALEN) == 0)) {
|
|
|
|
|
|
+ (ether_addr_equal(afx_hdl->tx_dst_addr, e->addr))) {
|
|
afx_hdl->peer_chan = ch.chnum;
|
|
afx_hdl->peer_chan = ch.chnum;
|
|
brcmf_dbg(INFO, "PROBE REQUEST: Peer found, channel=%d\n",
|
|
brcmf_dbg(INFO, "PROBE REQUEST: Peer found, channel=%d\n",
|
|
afx_hdl->peer_chan);
|
|
afx_hdl->peer_chan);
|