diff options
Diffstat (limited to 'drivers/staging/wlan-ng/prism2sta.c')
-rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 50f301d6521..32a3db85462 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c | |||
@@ -64,7 +64,7 @@ | |||
64 | #include <linux/byteorder/generic.h> | 64 | #include <linux/byteorder/generic.h> |
65 | #include <linux/ctype.h> | 65 | #include <linux/ctype.h> |
66 | 66 | ||
67 | #include <asm/io.h> | 67 | #include <linux/io.h> |
68 | #include <linux/delay.h> | 68 | #include <linux/delay.h> |
69 | #include <asm/byteorder.h> | 69 | #include <asm/byteorder.h> |
70 | #include <linux/if_arp.h> | 70 | #include <linux/if_arp.h> |
@@ -1023,13 +1023,13 @@ static void prism2sta_inf_tallies(wlandevice_t *wlandev, | |||
1023 | 1023 | ||
1024 | cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(u32); | 1024 | cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(u32); |
1025 | if (inf->framelen > 22) { | 1025 | if (inf->framelen > 22) { |
1026 | dst = (u32 *) & hw->tallies; | 1026 | dst = (u32 *) &hw->tallies; |
1027 | src32 = (u32 *) & inf->info.commtallies32; | 1027 | src32 = (u32 *) &inf->info.commtallies32; |
1028 | for (i = 0; i < cnt; i++, dst++, src32++) | 1028 | for (i = 0; i < cnt; i++, dst++, src32++) |
1029 | *dst += le32_to_cpu(*src32); | 1029 | *dst += le32_to_cpu(*src32); |
1030 | } else { | 1030 | } else { |
1031 | dst = (u32 *) & hw->tallies; | 1031 | dst = (u32 *) &hw->tallies; |
1032 | src16 = (u16 *) & inf->info.commtallies16; | 1032 | src16 = (u16 *) &inf->info.commtallies16; |
1033 | for (i = 0; i < cnt; i++, dst++, src16++) | 1033 | for (i = 0; i < cnt; i++, dst++, src16++) |
1034 | *dst += le16_to_cpu(*src16); | 1034 | *dst += le16_to_cpu(*src16); |
1035 | } | 1035 | } |
@@ -1280,9 +1280,8 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1280 | HFA384x_RID_CURRENTSSID, result); | 1280 | HFA384x_RID_CURRENTSSID, result); |
1281 | goto failed; | 1281 | goto failed; |
1282 | } | 1282 | } |
1283 | prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) & ssid, | 1283 | prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid, |
1284 | (p80211pstrd_t *) & | 1284 | (p80211pstrd_t *) &wlandev->ssid); |
1285 | wlandev->ssid); | ||
1286 | 1285 | ||
1287 | /* Collect the port status */ | 1286 | /* Collect the port status */ |
1288 | result = hfa384x_drvr_getconfig16(hw, | 1287 | result = hfa384x_drvr_getconfig16(hw, |
@@ -1368,8 +1367,8 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1368 | HFA384x_RID_CURRENTSSID, result); | 1367 | HFA384x_RID_CURRENTSSID, result); |
1369 | goto failed; | 1368 | goto failed; |
1370 | } | 1369 | } |
1371 | prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) & ssid, | 1370 | prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid, |
1372 | (p80211pstrd_t *) & wlandev->ssid); | 1371 | (p80211pstrd_t *) &wlandev->ssid); |
1373 | 1372 | ||
1374 | hw->link_status = HFA384x_LINK_CONNECTED; | 1373 | hw->link_status = HFA384x_LINK_CONNECTED; |
1375 | netif_carrier_on(wlandev->netdev); | 1374 | netif_carrier_on(wlandev->netdev); |
@@ -2028,8 +2027,8 @@ void prism2sta_commsqual_defer(struct work_struct *data) | |||
2028 | HFA384x_RID_CURRENTSSID, result); | 2027 | HFA384x_RID_CURRENTSSID, result); |
2029 | goto done; | 2028 | goto done; |
2030 | } | 2029 | } |
2031 | prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) & ssid, | 2030 | prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid, |
2032 | (p80211pstrd_t *) & wlandev->ssid); | 2031 | (p80211pstrd_t *) &wlandev->ssid); |
2033 | 2032 | ||
2034 | /* Reschedule timer */ | 2033 | /* Reschedule timer */ |
2035 | mod_timer(&hw->commsqual_timer, jiffies + HZ); | 2034 | mod_timer(&hw->commsqual_timer, jiffies + HZ); |