Re: [PATCH 07/12] brcmfmac: Convert ALLFFMAC to ether_broadcast_addr

[Arend van Spriel]

On 3/31/2018 9:05 AM, Joe Perches wrote:

Remove the local ALLFFMAC extern array and use the new global instead.


I stumbled upon this one couple of weeks ago. I moved the definition to 
flowring.c although I considered for a moment to pick up the task you 
took here valiantly.



Miscellanea:

o Convert char *mac to const char *mac as it can't be modified


The real reason is off course that your new global is const and thus mac 
variable need to be const as well to avoid compiler warning.


I have to agree with Kalle regarding the upstream logistics, but for 
what it is worth...


Acked-by: Arend van Spriel 

Signed-off-by: Joe Perches 
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c   | 2 --
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h   | 2 --
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c | 8 
  3 files changed, 4 insertions(+), 8 deletions(-)

[PATCH 07/12] brcmfmac: Convert ALLFFMAC to ether_broadcast_addr

[Joe Perches]

Remove the local ALLFFMAC extern array and use the new global instead.

Miscellanea:

o Convert char *mac to const char *mac as it can't be modified

Signed-off-by: Joe Perches 
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c   | 2 --
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h   | 2 --
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c | 8 
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 105b8774fca9..cd3651069d0c 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -36,8 +36,6 @@ MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
 MODULE_LICENSE("Dual BSD/GPL");
 
-const u8 ALLFFMAC[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-
 #define BRCMF_DEFAULT_SCAN_CHANNEL_TIME40
 #define BRCMF_DEFAULT_SCAN_UNASSOC_TIME40
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
index ef914619e8e1..a34642cb4d2f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
@@ -19,8 +19,6 @@
 #include 
 #include "fwil_types.h"
 
-extern const u8 ALLFFMAC[ETH_ALEN];
-
 #define BRCMF_FW_ALTPATH_LEN   256
 
 /* Definitions for the module global and device specific settings are defined
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
index d0b738da2458..f042531dd43c 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
@@ -73,13 +73,13 @@ u32 brcmf_flowring_lookup(struct brcmf_flowring *flow, u8 
da[ETH_ALEN],
bool found;
bool sta;
u8 fifo;
-   u8 *mac;
+   const u8 *mac;
 
fifo = brcmf_flowring_prio2fifo[prio];
sta = (flow->addr_mode[ifidx] == ADDR_INDIRECT);
mac = da;
if ((!sta) && (is_multicast_ether_addr(da))) {
-   mac = (u8 *)ALLFFMAC;
+   mac = ether_broadcast_addr;
fifo = 0;
}
if ((sta) && (flow->tdls_active) &&
@@ -118,13 +118,13 @@ u32 brcmf_flowring_create(struct brcmf_flowring *flow, u8 
da[ETH_ALEN],
bool found;
u8 fifo;
bool sta;
-   u8 *mac;
+   const u8 *mac;
 
fifo = brcmf_flowring_prio2fifo[prio];
sta = (flow->addr_mode[ifidx] == ADDR_INDIRECT);
mac = da;
if ((!sta) && (is_multicast_ether_addr(da))) {
-   mac = (u8 *)ALLFFMAC;
+   mac = ether_broadcast_addr;
fifo = 0;
}
if ((sta) && (flow->tdls_active) &&
-- 
2.15.0