Skip to content

Commit bac0bfd

Browse files
CaslynCQ Bot
authored and
CQ Bot
committed
[drivers][broadcom] Move temporary into variable
llvm/llvm-project#120223 became more strict about discarded value expressions. This CL moves the array reference into a local variable to operate on. Bug: 385748190 Change-Id: I468bc0e122778a867ea452535be5d4562802264e Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1179632 Reviewed-by: Karl Ward <[email protected]> Commit-Queue: Auto-Submit <[email protected]> Fuchsia-Auto-Submit: Caslyn Tonelli <[email protected]>
1 parent 967bd82 commit bac0bfd

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/cfg80211.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2853,10 +2853,11 @@ static zx_status_t brcmf_cfg80211_add_key(struct net_device* ndev,
28532853
// IEEE 802.11-2016 3.2 (c.f. "vendor organizationally unique identifier")
28542854
constexpr uint8_t kIeeeOui[] = {0x00, 0x0F, 0xAC};
28552855
constexpr uint8_t kMsftOui[] = {0x00, 0x50, 0xF2};
2856-
if (!std::equal(req->cipher_oui().begin(), req->cipher_oui().begin() + req->cipher_oui().size(),
2857-
kIeeeOui, kIeeeOui + std::size(kIeeeOui)) &&
2858-
!std::equal(req->cipher_oui().begin(), req->cipher_oui().begin() + req->cipher_oui().size(),
2859-
kMsftOui, kMsftOui + std::size(kMsftOui))) {
2856+
auto cipher_oui = req->cipher_oui();
2857+
if (!std::equal(cipher_oui.begin(), cipher_oui.begin() + cipher_oui.size(), kIeeeOui,
2858+
kIeeeOui + std::size(kIeeeOui)) &&
2859+
!std::equal(cipher_oui.begin(), cipher_oui.begin() + cipher_oui.size(), kMsftOui,
2860+
kMsftOui + std::size(kMsftOui))) {
28602861
BRCMF_ERR("Cipher OUI does not match either IEEE or MSFT OUI, not supported.");
28612862
return ZX_ERR_NOT_SUPPORTED;
28622863
}

src/connectivity/wlan/drivers/third_party/broadcom/brcmfmac/sim/test/sim_test.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ void SimInterface::RoamConf(RoamConfRequestView request, RoamConfCompleter::Sync
168168
if (request->status_code() == wlan_ieee80211::StatusCode::kSuccess) {
169169
++stats_.roam_successes;
170170
ZX_ASSERT(request->has_selected_bssid());
171-
ZX_ASSERT(request->selected_bssid().size() == ETH_ALEN);
172-
memcpy(assoc_ctx_.bssid.byte, request->selected_bssid().data(), ETH_ALEN);
171+
auto bssid = request->selected_bssid();
172+
ZX_ASSERT(bssid.size() == ETH_ALEN);
173+
memcpy(assoc_ctx_.bssid.byte, bssid.data(), ETH_ALEN);
173174
} else {
174175
assoc_ctx_.state = AssocContext::kNone;
175176
}
@@ -189,8 +190,9 @@ void SimInterface::RoamResultInd(RoamResultIndRequestView request,
189190
if (request->status_code() == wlan_ieee80211::StatusCode::kSuccess) {
190191
stats_.connect_successes++;
191192
ZX_ASSERT(request->has_selected_bssid());
192-
ZX_ASSERT(request->selected_bssid().size() == ETH_ALEN);
193-
memcpy(assoc_ctx_.bssid.byte, request->selected_bssid().data(), ETH_ALEN);
193+
auto bssid = request->selected_bssid();
194+
ZX_ASSERT(bssid.size() == ETH_ALEN);
195+
memcpy(assoc_ctx_.bssid.byte, bssid.data(), ETH_ALEN);
194196
} else {
195197
assoc_ctx_.state = AssocContext::kNone;
196198
}

0 commit comments

Comments
 (0)