|
@@ -764,16 +764,16 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
|
|
|
|
|
|
if (hw->cap_sup_sta.id == 0x04) {
|
|
if (hw->cap_sup_sta.id == 0x04) {
|
|
netdev_info(wlandev->netdev,
|
|
netdev_info(wlandev->netdev,
|
|
- "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
|
|
|
|
- hw->cap_sup_sta.role, hw->cap_sup_sta.id,
|
|
|
|
- hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
|
|
|
|
- hw->cap_sup_sta.top);
|
|
|
|
|
|
+ "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
|
|
|
|
+ hw->cap_sup_sta.role, hw->cap_sup_sta.id,
|
|
|
|
+ hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
|
|
|
|
+ hw->cap_sup_sta.top);
|
|
} else {
|
|
} else {
|
|
netdev_info(wlandev->netdev,
|
|
netdev_info(wlandev->netdev,
|
|
- "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
|
|
|
|
- hw->cap_sup_sta.role, hw->cap_sup_sta.id,
|
|
|
|
- hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
|
|
|
|
- hw->cap_sup_sta.top);
|
|
|
|
|
|
+ "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
|
|
|
|
+ hw->cap_sup_sta.role, hw->cap_sup_sta.id,
|
|
|
|
+ hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
|
|
|
|
+ hw->cap_sup_sta.top);
|
|
}
|
|
}
|
|
|
|
|
|
/* Compatibility range, primary f/w actor, CFI supplier */
|
|
/* Compatibility range, primary f/w actor, CFI supplier */
|
|
@@ -1189,7 +1189,6 @@ void prism2sta_processing_defer(struct work_struct *data)
|
|
inf = (struct hfa384x_inf_frame *)skb->data;
|
|
inf = (struct hfa384x_inf_frame *)skb->data;
|
|
prism2sta_inf_authreq_defer(wlandev, inf);
|
|
prism2sta_inf_authreq_defer(wlandev, inf);
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* Now let's handle the linkstatus stuff */
|
|
/* Now let's handle the linkstatus stuff */
|
|
@@ -1241,9 +1240,9 @@ void prism2sta_processing_defer(struct work_struct *data)
|
|
/* Collect the BSSID, and set state to allow tx */
|
|
/* Collect the BSSID, and set state to allow tx */
|
|
|
|
|
|
result = hfa384x_drvr_getconfig(hw,
|
|
result = hfa384x_drvr_getconfig(hw,
|
|
- HFA384x_RID_CURRENTBSSID,
|
|
|
|
- wlandev->bssid,
|
|
|
|
- WLAN_BSSID_LEN);
|
|
|
|
|
|
+ HFA384x_RID_CURRENTBSSID,
|
|
|
|
+ wlandev->bssid,
|
|
|
|
+ WLAN_BSSID_LEN);
|
|
if (result) {
|
|
if (result) {
|
|
pr_debug
|
|
pr_debug
|
|
("getconfig(0x%02x) failed, result = %d\n",
|
|
("getconfig(0x%02x) failed, result = %d\n",
|
|
@@ -1260,14 +1259,13 @@ void prism2sta_processing_defer(struct work_struct *data)
|
|
HFA384x_RID_CURRENTSSID, result);
|
|
HFA384x_RID_CURRENTSSID, result);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- prism2mgmt_bytestr2pstr(
|
|
|
|
- (struct hfa384x_bytestr *)&ssid,
|
|
|
|
- (struct p80211pstrd *)&wlandev->ssid);
|
|
|
|
|
|
+ prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *)&ssid,
|
|
|
|
+ (struct p80211pstrd *)&wlandev->ssid);
|
|
|
|
|
|
/* Collect the port status */
|
|
/* Collect the port status */
|
|
result = hfa384x_drvr_getconfig16(hw,
|
|
result = hfa384x_drvr_getconfig16(hw,
|
|
- HFA384x_RID_PORTSTATUS,
|
|
|
|
- &portstatus);
|
|
|
|
|
|
+ HFA384x_RID_PORTSTATUS,
|
|
|
|
+ &portstatus);
|
|
if (result) {
|
|
if (result) {
|
|
pr_debug
|
|
pr_debug
|
|
("getconfig(0x%02x) failed, result = %d\n",
|
|
("getconfig(0x%02x) failed, result = %d\n",
|
|
@@ -1404,7 +1402,7 @@ void prism2sta_processing_defer(struct work_struct *data)
|
|
&joinreq,
|
|
&joinreq,
|
|
HFA384x_RID_JOINREQUEST_LEN);
|
|
HFA384x_RID_JOINREQUEST_LEN);
|
|
netdev_info(wlandev->netdev,
|
|
netdev_info(wlandev->netdev,
|
|
- "linkstatus=ASSOCFAIL (re-submitting join)\n");
|
|
|
|
|
|
+ "linkstatus=ASSOCFAIL (re-submitting join)\n");
|
|
} else {
|
|
} else {
|
|
netdev_info(wlandev->netdev, "linkstatus=ASSOCFAIL (unhandled)\n");
|
|
netdev_info(wlandev->netdev, "linkstatus=ASSOCFAIL (unhandled)\n");
|
|
}
|
|
}
|
|
@@ -1501,7 +1499,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
|
|
if (i >= hw->authlist.cnt) {
|
|
if (i >= hw->authlist.cnt) {
|
|
if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL)
|
|
if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL)
|
|
netdev_warn(wlandev->netdev,
|
|
netdev_warn(wlandev->netdev,
|
|
- "assocstatus info frame received for non-authenticated station.\n");
|
|
|
|
|
|
+ "assocstatus info frame received for non-authenticated station.\n");
|
|
} else {
|
|
} else {
|
|
hw->authlist.assoc[i] =
|
|
hw->authlist.assoc[i] =
|
|
(rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC ||
|
|
(rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC ||
|
|
@@ -1509,7 +1507,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
|
|
|
|
|
|
if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL)
|
|
if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL)
|
|
netdev_warn(wlandev->netdev,
|
|
netdev_warn(wlandev->netdev,
|
|
-"authfail assocstatus info frame received for authenticated station.\n");
|
|
|
|
|
|
+ "authfail assocstatus info frame received for authenticated station.\n");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1674,9 +1672,8 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
|
|
if (hw->authlist.cnt >= WLAN_AUTH_MAX) {
|
|
if (hw->authlist.cnt >= WLAN_AUTH_MAX) {
|
|
rec.status = cpu_to_le16(P80211ENUM_status_ap_full);
|
|
rec.status = cpu_to_le16(P80211ENUM_status_ap_full);
|
|
} else {
|
|
} else {
|
|
- ether_addr_copy(
|
|
|
|
- hw->authlist.addr[hw->authlist.cnt],
|
|
|
|
- rec.address);
|
|
|
|
|
|
+ ether_addr_copy(hw->authlist.addr[hw->authlist.cnt],
|
|
|
|
+ rec.address);
|
|
hw->authlist.cnt++;
|
|
hw->authlist.cnt++;
|
|
added = 1;
|
|
added = 1;
|
|
}
|
|
}
|
|
@@ -1697,8 +1694,8 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
|
|
if (added)
|
|
if (added)
|
|
hw->authlist.cnt--;
|
|
hw->authlist.cnt--;
|
|
netdev_err(wlandev->netdev,
|
|
netdev_err(wlandev->netdev,
|
|
- "setconfig(authenticatestation) failed, result=%d\n",
|
|
|
|
- result);
|
|
|
|
|
|
+ "setconfig(authenticatestation) failed, result=%d\n",
|
|
|
|
+ result);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1937,9 +1934,8 @@ void prism2sta_commsqual_defer(struct work_struct *data)
|
|
|
|
|
|
/* It only makes sense to poll these in non-IBSS */
|
|
/* It only makes sense to poll these in non-IBSS */
|
|
if (wlandev->macmode != WLAN_MACMODE_IBSS_STA) {
|
|
if (wlandev->macmode != WLAN_MACMODE_IBSS_STA) {
|
|
- result = hfa384x_drvr_getconfig(
|
|
|
|
- hw, HFA384x_RID_DBMCOMMSQUALITY,
|
|
|
|
- &hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN);
|
|
|
|
|
|
+ result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DBMCOMMSQUALITY,
|
|
|
|
+ &hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN);
|
|
|
|
|
|
if (result) {
|
|
if (result) {
|
|
netdev_err(wlandev->netdev, "error fetching commsqual\n");
|
|
netdev_err(wlandev->netdev, "error fetching commsqual\n");
|