Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327897
b: refs/heads/master
c: a71bf90
h: refs/heads/master
i:
  327895: 155f687
v: v3
  • Loading branch information
Wei Yongjun authored and John W. Linville committed Sep 7, 2012
1 parent 88e5afe commit f8e1c9c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d1c6d1c74c82410c167372c12ff780e39d911b7
refs/heads/master: a71bf90facfdbb7322acd84c1299d68755ba5dfe
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/mwifiex/sta_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f8e1c9c

Please sign in to comment.