|
@@ -199,13 +199,13 @@ enum ndis_80211_pmkid_cand_list_flag_bits {
|
|
|
|
|
|
struct ndis_80211_auth_request {
|
|
|
__le32 length;
|
|
|
- u8 bssid[6];
|
|
|
+ u8 bssid[ETH_ALEN];
|
|
|
u8 padding[2];
|
|
|
__le32 flags;
|
|
|
} __packed;
|
|
|
|
|
|
struct ndis_80211_pmkid_candidate {
|
|
|
- u8 bssid[6];
|
|
|
+ u8 bssid[ETH_ALEN];
|
|
|
u8 padding[2];
|
|
|
__le32 flags;
|
|
|
} __packed;
|
|
@@ -248,7 +248,7 @@ struct ndis_80211_conf {
|
|
|
|
|
|
struct ndis_80211_bssid_ex {
|
|
|
__le32 length;
|
|
|
- u8 mac[6];
|
|
|
+ u8 mac[ETH_ALEN];
|
|
|
u8 padding[2];
|
|
|
struct ndis_80211_ssid ssid;
|
|
|
__le32 privacy;
|
|
@@ -283,7 +283,7 @@ struct ndis_80211_key {
|
|
|
__le32 size;
|
|
|
__le32 index;
|
|
|
__le32 length;
|
|
|
- u8 bssid[6];
|
|
|
+ u8 bssid[ETH_ALEN];
|
|
|
u8 padding[6];
|
|
|
u8 rsc[8];
|
|
|
u8 material[32];
|
|
@@ -292,7 +292,7 @@ struct ndis_80211_key {
|
|
|
struct ndis_80211_remove_key {
|
|
|
__le32 size;
|
|
|
__le32 index;
|
|
|
- u8 bssid[6];
|
|
|
+ u8 bssid[ETH_ALEN];
|
|
|
u8 padding[2];
|
|
|
} __packed;
|
|
|
|
|
@@ -310,7 +310,7 @@ struct ndis_80211_assoc_info {
|
|
|
struct req_ie {
|
|
|
__le16 capa;
|
|
|
__le16 listen_interval;
|
|
|
- u8 cur_ap_address[6];
|
|
|
+ u8 cur_ap_address[ETH_ALEN];
|
|
|
} req_ie;
|
|
|
__le32 req_ie_length;
|
|
|
__le32 offset_req_ies;
|
|
@@ -338,7 +338,7 @@ struct ndis_80211_capability {
|
|
|
} __packed;
|
|
|
|
|
|
struct ndis_80211_bssid_info {
|
|
|
- u8 bssid[6];
|
|
|
+ u8 bssid[ETH_ALEN];
|
|
|
u8 pmkid[16];
|
|
|
} __packed;
|
|
|
|
|
@@ -1037,7 +1037,7 @@ static int get_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
|
|
|
bssid, &len);
|
|
|
|
|
|
if (ret != 0)
|
|
|
- memset(bssid, 0, ETH_ALEN);
|
|
|
+ eth_zero_addr(bssid);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -1391,7 +1391,7 @@ static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,
|
|
|
priv->encr_keys[index].len = key_len;
|
|
|
priv->encr_keys[index].cipher = cipher;
|
|
|
memcpy(&priv->encr_keys[index].material, key, key_len);
|
|
|
- memset(&priv->encr_keys[index].bssid, 0xff, ETH_ALEN);
|
|
|
+ eth_broadcast_addr(priv->encr_keys[index].bssid);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -1466,7 +1466,7 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
|
|
|
} else {
|
|
|
/* group key */
|
|
|
if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
|
|
|
- memset(ndis_key.bssid, 0xff, ETH_ALEN);
|
|
|
+ eth_broadcast_addr(ndis_key.bssid);
|
|
|
else
|
|
|
get_bssid(usbdev, ndis_key.bssid);
|
|
|
}
|
|
@@ -1486,7 +1486,7 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
|
|
|
if (flags & NDIS_80211_ADDKEY_PAIRWISE_KEY)
|
|
|
memcpy(&priv->encr_keys[index].bssid, ndis_key.bssid, ETH_ALEN);
|
|
|
else
|
|
|
- memset(&priv->encr_keys[index].bssid, 0xff, ETH_ALEN);
|
|
|
+ eth_broadcast_addr(priv->encr_keys[index].bssid);
|
|
|
|
|
|
if (flags & NDIS_80211_ADDKEY_TRANSMIT_KEY)
|
|
|
priv->encr_tx_key_index = index;
|
|
@@ -2280,7 +2280,7 @@ static int rndis_disconnect(struct wiphy *wiphy, struct net_device *dev,
|
|
|
netdev_dbg(usbdev->net, "cfg80211.disconnect(%d)\n", reason_code);
|
|
|
|
|
|
priv->connected = false;
|
|
|
- memset(priv->bssid, 0, ETH_ALEN);
|
|
|
+ eth_zero_addr(priv->bssid);
|
|
|
|
|
|
return deauthenticate(usbdev);
|
|
|
}
|
|
@@ -2392,7 +2392,7 @@ static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
|
|
|
netdev_dbg(usbdev->net, "cfg80211.leave_ibss()\n");
|
|
|
|
|
|
priv->connected = false;
|
|
|
- memset(priv->bssid, 0, ETH_ALEN);
|
|
|
+ eth_zero_addr(priv->bssid);
|
|
|
|
|
|
return deauthenticate(usbdev);
|
|
|
}
|
|
@@ -2857,7 +2857,7 @@ static void rndis_wlan_do_link_down_work(struct usbnet *usbdev)
|
|
|
|
|
|
if (priv->connected) {
|
|
|
priv->connected = false;
|
|
|
- memset(priv->bssid, 0, ETH_ALEN);
|
|
|
+ eth_zero_addr(priv->bssid);
|
|
|
|
|
|
deauthenticate(usbdev);
|
|
|
|