aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlan-ng/p80211req.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2008-10-29 10:42:53 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 16:51:56 -0500
commitaaad430378dd128ee015c8ed6e77809317c496a5 (patch)
tree8f540c92547f97fd167cf7384731f142e9ecb153 /drivers/staging/wlan-ng/p80211req.c
parent5704976fa9924c1b51b07f30dea7fb3828f6b76f (diff)
Staging: wlan-ng: Use standard kernel integer (u32/s32/etc) types.
wlan-ng needed to interact with userspace, and support very old kernels, so it used to define its own types for integers to ensure consistency. It's all rather irrelevant now. Signed-off-by: Solomon Peachy <pizza@shaftnet.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211req.c')
-rw-r--r--drivers/staging/wlan-ng/p80211req.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index 83bd65b6248..310737b2927 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -125,7 +125,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mib
125* Potentially blocks the caller, so it's a good idea to 125* Potentially blocks the caller, so it's a good idea to
126* not call this function from an interrupt context. 126* not call this function from an interrupt context.
127----------------------------------------------------------------*/ 127----------------------------------------------------------------*/
128int p80211req_dorequest( wlandevice_t *wlandev, UINT8 *msgbuf) 128int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
129{ 129{
130 int result = 0; 130 int result = 0;
131 p80211msg_t *msg = (p80211msg_t*)msgbuf; 131 p80211msg_t *msg = (p80211msg_t*)msgbuf;
@@ -223,13 +223,13 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
223{ 223{
224 p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data; 224 p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data;
225 p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data; 225 p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data;
226 UINT8 *key = mibitem->data + sizeof(p80211pstrd_t); 226 u8 *key = mibitem->data + sizeof(p80211pstrd_t);
227 227
228 DBFENTER; 228 DBFENTER;
229 229
230 switch (mibitem->did) { 230 switch (mibitem->did) {
231 case DIDmib_dot11smt_p80211Table_p80211_ifstate: { 231 case DIDmib_dot11smt_p80211Table_p80211_ifstate: {
232 UINT32 *data = (UINT32 *) mibitem->data; 232 u32 *data = (u32 *) mibitem->data;
233 if (isget) 233 if (isget)
234 switch (wlandev->msdstate) { 234 switch (wlandev->msdstate) {
235 case WLAN_MSD_HWPRESENT: 235 case WLAN_MSD_HWPRESENT:
@@ -247,7 +247,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
247 break; 247 break;
248 } 248 }
249 case DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled: { 249 case DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled: {
250 UINT32 *data = (UINT32 *) mibitem->data; 250 u32 *data = (u32 *) mibitem->data;
251 251
252 if (isget) 252 if (isget)
253 *data = wlandev->shortpreamble; 253 *data = wlandev->shortpreamble;
@@ -276,7 +276,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
276 break; 276 break;
277 } 277 }
278 case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: { 278 case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: {
279 UINT32 *data = (UINT32 *) mibitem->data; 279 u32 *data = (u32 *) mibitem->data;
280 280
281 if (isget) { 281 if (isget) {
282 *data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK; 282 *data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK;
@@ -288,7 +288,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
288 break; 288 break;
289 } 289 }
290 case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: { 290 case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: {
291 UINT32 *data = (UINT32 *) mibitem->data; 291 u32 *data = (u32 *) mibitem->data;
292 292
293 if (isget) { 293 if (isget) {
294 if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) 294 if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED)
@@ -303,7 +303,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
303 break; 303 break;
304 } 304 }
305 case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: { 305 case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: {
306 UINT32 *data = (UINT32 *) mibitem->data; 306 u32 *data = (u32 *) mibitem->data;
307 307
308 if (isget) { 308 if (isget) {
309 if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED) 309 if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED)