| Message ID | CAPgLHd81cZS4K-wzcLycRTVF3pGy-S6=YR9UZ++Ot=6OXZp-5Q@mail.gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > Using is_broadcast_ether_addr() instead of directly use > memcmp() to determine if the ethernet address is broadcast > address. > > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Bing Zhao <bzhao@marvell.com> Thanks, Bing > --- > drivers/net/wireless/mwifiex/sta_cmd.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c > index df3a33c..323b91b 100644 > --- a/drivers/net/wireless/mwifiex/sta_cmd.c > +++ b/drivers/net/wireless/mwifiex/sta_cmd.c > @@ -551,7 +551,6 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, > struct host_cmd_tlv_mac_addr *tlv_mac; > u16 key_param_len = 0, cmd_size; > int ret = 0; > - const u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; > > cmd->command = cpu_to_le16(HostCmd_CMD_802_11_KEY_MATERIAL); > key_material->action = cpu_to_le16(cmd_action); > @@ -593,7 +592,7 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, > /* set 0 when re-key */ > key_material->key_param_set.key[1] = 0; > > - if (0 != memcmp(enc_key->mac_addr, bc_mac, sizeof(bc_mac))) { > + if (!is_broadcast_ether_addr(enc_key->mac_addr)) { > /* WAPI pairwise key: unicast */ > key_material->key_param_set.key_info |= > cpu_to_le16(KEY_UNICAST); > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c index df3a33c..323b91b 100644 --- a/drivers/net/wireless/mwifiex/sta_cmd.c +++ b/drivers/net/wireless/mwifiex/sta_cmd.c @@ -551,7 +551,6 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, struct host_cmd_tlv_mac_addr *tlv_mac; u16 key_param_len = 0, cmd_size; int ret = 0; - const u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; cmd->command = cpu_to_le16(HostCmd_CMD_802_11_KEY_MATERIAL); key_material->action = cpu_to_le16(cmd_action); @@ -593,7 +592,7 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, /* set 0 when re-key */ key_material->key_param_set.key[1] = 0; - if (0 != memcmp(enc_key->mac_addr, bc_mac, sizeof(bc_mac))) { + if (!is_broadcast_ether_addr(enc_key->mac_addr)) { /* WAPI pairwise key: unicast */ key_material->key_param_set.key_info |= cpu_to_le16(KEY_UNICAST);