|
@@ -113,7 +113,7 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
|
|
|
int rc = 0;
|
|
|
|
|
|
DPRINTK(3, "\n");
|
|
|
- ap = &(priv->current_ap);
|
|
|
+ ap = &priv->current_ap;
|
|
|
|
|
|
if ((priv->connect_status & CONNECT_STATUS_MASK) == DISCONNECT_STATUS) {
|
|
|
memset(ap, 0, sizeof(struct local_ap_t));
|
|
@@ -121,19 +121,19 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
|
|
|
}
|
|
|
|
|
|
/* bssid */
|
|
|
- memcpy(&(ap->bssid[0]), &(ap_info->bssid[0]), ETH_ALEN);
|
|
|
+ memcpy(ap->bssid, ap_info->bssid, ETH_ALEN);
|
|
|
/* essid */
|
|
|
- memcpy(&(ap->ssid.body[0]), &(priv->reg.ssid.body[0]),
|
|
|
+ memcpy(ap->ssid.body, priv->reg.ssid.body,
|
|
|
priv->reg.ssid.size);
|
|
|
ap->ssid.size = priv->reg.ssid.size;
|
|
|
/* rate_set */
|
|
|
- memcpy(&(ap->rate_set.body[0]), &(ap_info->rate_set.body[0]),
|
|
|
+ memcpy(ap->rate_set.body, ap_info->rate_set.body,
|
|
|
ap_info->rate_set.size);
|
|
|
ap->rate_set.size = ap_info->rate_set.size;
|
|
|
if (ap_info->ext_rate_set.size) {
|
|
|
/* rate_set */
|
|
|
- memcpy(&(ap->rate_set.body[ap->rate_set.size]),
|
|
|
- &(ap_info->ext_rate_set.body[0]),
|
|
|
+ memcpy(&ap->rate_set.body[ap->rate_set.size],
|
|
|
+ ap_info->ext_rate_set.body,
|
|
|
ap_info->ext_rate_set.size);
|
|
|
ap->rate_set.size += ap_info->ext_rate_set.size;
|
|
|
}
|
|
@@ -153,11 +153,11 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
|
|
|
ap->rsn_ie.id = 0x30;
|
|
|
if (ap_info->rsn.size <= RSN_IE_BODY_MAX) {
|
|
|
ap->rsn_ie.size = ap_info->rsn.size;
|
|
|
- memcpy(&(ap->rsn_ie.body[0]), &(ap_info->rsn.body[0]),
|
|
|
+ memcpy(ap->rsn_ie.body, ap_info->rsn.body,
|
|
|
ap_info->rsn.size);
|
|
|
} else {
|
|
|
ap->rsn_ie.size = RSN_IE_BODY_MAX;
|
|
|
- memcpy(&(ap->rsn_ie.body[0]), &(ap_info->rsn.body[0]),
|
|
|
+ memcpy(ap->rsn_ie.body, ap_info->rsn.body,
|
|
|
RSN_IE_BODY_MAX);
|
|
|
}
|
|
|
} else if ((ap_info->rsn_mode & RSN_MODE_WPA)
|
|
@@ -165,11 +165,11 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
|
|
|
ap->wpa_ie.id = 0xdd;
|
|
|
if (ap_info->rsn.size <= RSN_IE_BODY_MAX) {
|
|
|
ap->wpa_ie.size = ap_info->rsn.size;
|
|
|
- memcpy(&(ap->wpa_ie.body[0]), &(ap_info->rsn.body[0]),
|
|
|
+ memcpy(ap->wpa_ie.body, ap_info->rsn.body,
|
|
|
ap_info->rsn.size);
|
|
|
} else {
|
|
|
ap->wpa_ie.size = RSN_IE_BODY_MAX;
|
|
|
- memcpy(&(ap->wpa_ie.body[0]), &(ap_info->rsn.body[0]),
|
|
|
+ memcpy(ap->wpa_ie.body, ap_info->rsn.body,
|
|
|
RSN_IE_BODY_MAX);
|
|
|
}
|
|
|
} else {
|
|
@@ -184,7 +184,7 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
|
|
|
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
|
|
|
if ((priv->connect_status & CONNECT_STATUS_MASK) == CONNECT_STATUS) {
|
|
|
memcpy(wrqu.ap_addr.sa_data,
|
|
|
- &(priv->current_ap.bssid[0]), ETH_ALEN);
|
|
|
+ priv->current_ap.bssid, ETH_ALEN);
|
|
|
DPRINTK(3,
|
|
|
"IWEVENT: connect bssid=%pM\n", wrqu.ap_addr.sa_data);
|
|
|
wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL);
|
|
@@ -212,7 +212,7 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
|
|
|
memset(ap, 0, sizeof(struct local_ap_t));
|
|
|
|
|
|
/* bssid */
|
|
|
- memcpy(&(ap->bssid[0]), &(ap_info->bssid[0]), ETH_ALEN);
|
|
|
+ memcpy(ap->bssid, ap_info->bssid, ETH_ALEN);
|
|
|
/* rssi */
|
|
|
ap->rssi = ap_info->rssi;
|
|
|
/* sq */
|
|
@@ -224,7 +224,7 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
|
|
|
/* channel */
|
|
|
ap->channel = ap_info->ch_info;
|
|
|
|
|
|
- bp = &(ap_info->body[0]);
|
|
|
+ bp = ap_info->body;
|
|
|
bsize = ap_info->body_size;
|
|
|
offset = 0;
|
|
|
|