diff options
Diffstat (limited to 'drivers/staging/wlan-ng/p80211wext.c')
-rw-r--r-- | drivers/staging/wlan-ng/p80211wext.c | 143 |
1 files changed, 68 insertions, 75 deletions
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c index e73123b26df..984e45d9f70 100644 --- a/drivers/staging/wlan-ng/p80211wext.c +++ b/drivers/staging/wlan-ng/p80211wext.c | |||
@@ -37,8 +37,6 @@ | |||
37 | /*================================================================*/ | 37 | /*================================================================*/ |
38 | /* System Includes */ | 38 | /* System Includes */ |
39 | 39 | ||
40 | |||
41 | |||
42 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
43 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
44 | #include <linux/types.h> | 42 | #include <linux/types.h> |
@@ -68,10 +66,10 @@ | |||
68 | #include "p80211ioctl.h" | 66 | #include "p80211ioctl.h" |
69 | #include "p80211req.h" | 67 | #include "p80211req.h" |
70 | 68 | ||
71 | static int p80211wext_giwrate(netdevice_t *dev, | 69 | static int p80211wext_giwrate(netdevice_t * dev, |
72 | struct iw_request_info *info, | 70 | struct iw_request_info *info, |
73 | struct iw_param *rrq, char *extra); | 71 | struct iw_param *rrq, char *extra); |
74 | static int p80211wext_giwessid(netdevice_t *dev, | 72 | static int p80211wext_giwessid(netdevice_t * dev, |
75 | struct iw_request_info *info, | 73 | struct iw_request_info *info, |
76 | struct iw_point *data, char *essid); | 74 | struct iw_point *data, char *essid); |
77 | 75 | ||
@@ -132,7 +130,7 @@ static int qual_as_percent(int snr) | |||
132 | return 100; | 130 | return 100; |
133 | } | 131 | } |
134 | 132 | ||
135 | static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data) | 133 | static int p80211wext_dorequest(wlandevice_t * wlandev, u32 did, u32 data) |
136 | { | 134 | { |
137 | p80211msg_dot11req_mibset_t msg; | 135 | p80211msg_dot11req_mibset_t msg; |
138 | p80211item_uint32_t mibitem; | 136 | p80211item_uint32_t mibitem; |
@@ -142,12 +140,12 @@ static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data) | |||
142 | mibitem.did = did; | 140 | mibitem.did = did; |
143 | mibitem.data = data; | 141 | mibitem.data = data; |
144 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 142 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
145 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 143 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
146 | 144 | ||
147 | return result; | 145 | return result; |
148 | } | 146 | } |
149 | 147 | ||
150 | static int p80211wext_autojoin(wlandevice_t *wlandev) | 148 | static int p80211wext_autojoin(wlandevice_t * wlandev) |
151 | { | 149 | { |
152 | p80211msg_lnxreq_autojoin_t msg; | 150 | p80211msg_lnxreq_autojoin_t msg; |
153 | struct iw_point data; | 151 | struct iw_point data; |
@@ -179,7 +177,7 @@ static int p80211wext_autojoin(wlandevice_t *wlandev) | |||
179 | memcpy(msg.ssid.data.data, ssid, data.length); | 177 | memcpy(msg.ssid.data.data, ssid, data.length); |
180 | msg.ssid.data.len = data.length; | 178 | msg.ssid.data.len = data.length; |
181 | 179 | ||
182 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 180 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
183 | 181 | ||
184 | if (result) { | 182 | if (result) { |
185 | err = -EFAULT; | 183 | err = -EFAULT; |
@@ -216,7 +214,7 @@ struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev) | |||
216 | if (wlandev->mlmerequest == NULL) | 214 | if (wlandev->mlmerequest == NULL) |
217 | return NULL; | 215 | return NULL; |
218 | 216 | ||
219 | retval = wlandev->mlmerequest(wlandev, (p80211msg_t *)&quality); | 217 | retval = wlandev->mlmerequest(wlandev, (p80211msg_t *) & quality); |
220 | 218 | ||
221 | wstats->qual.qual = qual_as_percent(quality.link.data); /* overall link quality */ | 219 | wstats->qual.qual = qual_as_percent(quality.link.data); /* overall link quality */ |
222 | wstats->qual.level = quality.level.data; /* instant signal level */ | 220 | wstats->qual.level = quality.level.data; /* instant signal level */ |
@@ -234,7 +232,7 @@ struct iw_statistics *p80211wext_get_wireless_stats(netdevice_t * dev) | |||
234 | return wstats; | 232 | return wstats; |
235 | } | 233 | } |
236 | 234 | ||
237 | static int p80211wext_giwname(netdevice_t *dev, | 235 | static int p80211wext_giwname(netdevice_t * dev, |
238 | struct iw_request_info *info, | 236 | struct iw_request_info *info, |
239 | char *name, char *extra) | 237 | char *name, char *extra) |
240 | { | 238 | { |
@@ -263,7 +261,7 @@ exit: | |||
263 | return err; | 261 | return err; |
264 | } | 262 | } |
265 | 263 | ||
266 | static int p80211wext_giwfreq(netdevice_t *dev, | 264 | static int p80211wext_giwfreq(netdevice_t * dev, |
267 | struct iw_request_info *info, | 265 | struct iw_request_info *info, |
268 | struct iw_freq *freq, char *extra) | 266 | struct iw_freq *freq, char *extra) |
269 | { | 267 | { |
@@ -276,7 +274,7 @@ static int p80211wext_giwfreq(netdevice_t *dev, | |||
276 | msg.msgcode = DIDmsg_dot11req_mibget; | 274 | msg.msgcode = DIDmsg_dot11req_mibget; |
277 | mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel; | 275 | mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel; |
278 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 276 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
279 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 277 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
280 | 278 | ||
281 | if (result) { | 279 | if (result) { |
282 | err = -EFAULT; | 280 | err = -EFAULT; |
@@ -298,7 +296,7 @@ exit: | |||
298 | return err; | 296 | return err; |
299 | } | 297 | } |
300 | 298 | ||
301 | static int p80211wext_siwfreq(netdevice_t *dev, | 299 | static int p80211wext_siwfreq(netdevice_t * dev, |
302 | struct iw_request_info *info, | 300 | struct iw_request_info *info, |
303 | struct iw_freq *freq, char *extra) | 301 | struct iw_freq *freq, char *extra) |
304 | { | 302 | { |
@@ -323,7 +321,7 @@ static int p80211wext_siwfreq(netdevice_t *dev, | |||
323 | mibitem.data = p80211_mhz_to_channel(freq->m); | 321 | mibitem.data = p80211_mhz_to_channel(freq->m); |
324 | 322 | ||
325 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 323 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
326 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 324 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
327 | 325 | ||
328 | if (result) { | 326 | if (result) { |
329 | err = -EFAULT; | 327 | err = -EFAULT; |
@@ -334,9 +332,9 @@ exit: | |||
334 | return err; | 332 | return err; |
335 | } | 333 | } |
336 | 334 | ||
337 | static int p80211wext_giwmode(netdevice_t *dev, | 335 | static int p80211wext_giwmode(netdevice_t * dev, |
338 | struct iw_request_info *info, | 336 | struct iw_request_info *info, |
339 | __u32 *mode, char *extra) | 337 | __u32 * mode, char *extra) |
340 | { | 338 | { |
341 | wlandevice_t *wlandev = dev->ml_priv; | 339 | wlandevice_t *wlandev = dev->ml_priv; |
342 | 340 | ||
@@ -358,9 +356,9 @@ static int p80211wext_giwmode(netdevice_t *dev, | |||
358 | return 0; | 356 | return 0; |
359 | } | 357 | } |
360 | 358 | ||
361 | static int p80211wext_siwmode(netdevice_t *dev, | 359 | static int p80211wext_siwmode(netdevice_t * dev, |
362 | struct iw_request_info *info, | 360 | struct iw_request_info *info, |
363 | __u32 *mode, char *extra) | 361 | __u32 * mode, char *extra) |
364 | { | 362 | { |
365 | wlandevice_t *wlandev = dev->ml_priv; | 363 | wlandevice_t *wlandev = dev->ml_priv; |
366 | p80211item_uint32_t mibitem; | 364 | p80211item_uint32_t mibitem; |
@@ -404,7 +402,7 @@ static int p80211wext_siwmode(netdevice_t *dev, | |||
404 | mibitem.did = DIDmib_p2_p2Static_p2CnfPortType; | 402 | mibitem.did = DIDmib_p2_p2Static_p2CnfPortType; |
405 | mibitem.data = (*mode == IW_MODE_ADHOC) ? 0 : 1; | 403 | mibitem.data = (*mode == IW_MODE_ADHOC) ? 0 : 1; |
406 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 404 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
407 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 405 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
408 | 406 | ||
409 | if (result) | 407 | if (result) |
410 | err = -EFAULT; | 408 | err = -EFAULT; |
@@ -413,7 +411,7 @@ exit: | |||
413 | return err; | 411 | return err; |
414 | } | 412 | } |
415 | 413 | ||
416 | static int p80211wext_giwrange(netdevice_t *dev, | 414 | static int p80211wext_giwrange(netdevice_t * dev, |
417 | struct iw_request_info *info, | 415 | struct iw_request_info *info, |
418 | struct iw_point *data, char *extra) | 416 | struct iw_point *data, char *extra) |
419 | { | 417 | { |
@@ -482,7 +480,7 @@ static int p80211wext_giwrange(netdevice_t *dev, | |||
482 | return 0; | 480 | return 0; |
483 | } | 481 | } |
484 | 482 | ||
485 | static int p80211wext_giwap(netdevice_t *dev, | 483 | static int p80211wext_giwap(netdevice_t * dev, |
486 | struct iw_request_info *info, | 484 | struct iw_request_info *info, |
487 | struct sockaddr *ap_addr, char *extra) | 485 | struct sockaddr *ap_addr, char *extra) |
488 | { | 486 | { |
@@ -495,7 +493,7 @@ static int p80211wext_giwap(netdevice_t *dev, | |||
495 | return 0; | 493 | return 0; |
496 | } | 494 | } |
497 | 495 | ||
498 | static int p80211wext_giwencode(netdevice_t *dev, | 496 | static int p80211wext_giwencode(netdevice_t * dev, |
499 | struct iw_request_info *info, | 497 | struct iw_request_info *info, |
500 | struct iw_point *erq, char *key) | 498 | struct iw_point *erq, char *key) |
501 | { | 499 | { |
@@ -536,7 +534,7 @@ exit: | |||
536 | return err; | 534 | return err; |
537 | } | 535 | } |
538 | 536 | ||
539 | static int p80211wext_siwencode(netdevice_t *dev, | 537 | static int p80211wext_siwencode(netdevice_t * dev, |
540 | struct iw_request_info *info, | 538 | struct iw_request_info *info, |
541 | struct iw_point *erq, char *key) | 539 | struct iw_point *erq, char *key) |
542 | { | 540 | { |
@@ -626,7 +624,7 @@ static int p80211wext_siwencode(netdevice_t *dev, | |||
626 | 624 | ||
627 | msg.msgcode = DIDmsg_dot11req_mibset; | 625 | msg.msgcode = DIDmsg_dot11req_mibset; |
628 | memcpy(&msg.mibattribute.data, &pstr, sizeof(pstr)); | 626 | memcpy(&msg.mibattribute.data, &pstr, sizeof(pstr)); |
629 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 627 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
630 | 628 | ||
631 | if (result) { | 629 | if (result) { |
632 | err = -EFAULT; | 630 | err = -EFAULT; |
@@ -683,7 +681,7 @@ exit: | |||
683 | return err; | 681 | return err; |
684 | } | 682 | } |
685 | 683 | ||
686 | static int p80211wext_giwessid(netdevice_t *dev, | 684 | static int p80211wext_giwessid(netdevice_t * dev, |
687 | struct iw_request_info *info, | 685 | struct iw_request_info *info, |
688 | struct iw_point *data, char *essid) | 686 | struct iw_point *data, char *essid) |
689 | { | 687 | { |
@@ -706,7 +704,7 @@ static int p80211wext_giwessid(netdevice_t *dev, | |||
706 | return 0; | 704 | return 0; |
707 | } | 705 | } |
708 | 706 | ||
709 | static int p80211wext_siwessid(netdevice_t *dev, | 707 | static int p80211wext_siwessid(netdevice_t * dev, |
710 | struct iw_request_info *info, | 708 | struct iw_request_info *info, |
711 | struct iw_point *data, char *essid) | 709 | struct iw_point *data, char *essid) |
712 | { | 710 | { |
@@ -742,7 +740,7 @@ static int p80211wext_siwessid(netdevice_t *dev, | |||
742 | msg.ssid.data.len = length; | 740 | msg.ssid.data.len = length; |
743 | 741 | ||
744 | pr_debug("autojoin_ssid for %s \n", essid); | 742 | pr_debug("autojoin_ssid for %s \n", essid); |
745 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 743 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
746 | pr_debug("autojoin_ssid %d\n", result); | 744 | pr_debug("autojoin_ssid %d\n", result); |
747 | 745 | ||
748 | if (result) { | 746 | if (result) { |
@@ -754,7 +752,7 @@ exit: | |||
754 | return err; | 752 | return err; |
755 | } | 753 | } |
756 | 754 | ||
757 | static int p80211wext_siwcommit(netdevice_t *dev, | 755 | static int p80211wext_siwcommit(netdevice_t * dev, |
758 | struct iw_request_info *info, | 756 | struct iw_request_info *info, |
759 | struct iw_point *data, char *essid) | 757 | struct iw_point *data, char *essid) |
760 | { | 758 | { |
@@ -773,7 +771,7 @@ exit: | |||
773 | return err; | 771 | return err; |
774 | } | 772 | } |
775 | 773 | ||
776 | static int p80211wext_giwrate(netdevice_t *dev, | 774 | static int p80211wext_giwrate(netdevice_t * dev, |
777 | struct iw_request_info *info, | 775 | struct iw_request_info *info, |
778 | struct iw_param *rrq, char *extra) | 776 | struct iw_param *rrq, char *extra) |
779 | { | 777 | { |
@@ -786,7 +784,7 @@ static int p80211wext_giwrate(netdevice_t *dev, | |||
786 | msg.msgcode = DIDmsg_dot11req_mibget; | 784 | msg.msgcode = DIDmsg_dot11req_mibget; |
787 | mibitem.did = DIDmib_p2_p2MAC_p2CurrentTxRate; | 785 | mibitem.did = DIDmib_p2_p2MAC_p2CurrentTxRate; |
788 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 786 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
789 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 787 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
790 | 788 | ||
791 | if (result) { | 789 | if (result) { |
792 | err = -EFAULT; | 790 | err = -EFAULT; |
@@ -824,7 +822,7 @@ exit: | |||
824 | return err; | 822 | return err; |
825 | } | 823 | } |
826 | 824 | ||
827 | static int p80211wext_giwrts(netdevice_t *dev, | 825 | static int p80211wext_giwrts(netdevice_t * dev, |
828 | struct iw_request_info *info, | 826 | struct iw_request_info *info, |
829 | struct iw_param *rts, char *extra) | 827 | struct iw_param *rts, char *extra) |
830 | { | 828 | { |
@@ -837,7 +835,7 @@ static int p80211wext_giwrts(netdevice_t *dev, | |||
837 | msg.msgcode = DIDmsg_dot11req_mibget; | 835 | msg.msgcode = DIDmsg_dot11req_mibget; |
838 | mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold; | 836 | mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold; |
839 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 837 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
840 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 838 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
841 | 839 | ||
842 | if (result) { | 840 | if (result) { |
843 | err = -EFAULT; | 841 | err = -EFAULT; |
@@ -854,7 +852,7 @@ exit: | |||
854 | return err; | 852 | return err; |
855 | } | 853 | } |
856 | 854 | ||
857 | static int p80211wext_siwrts(netdevice_t *dev, | 855 | static int p80211wext_siwrts(netdevice_t * dev, |
858 | struct iw_request_info *info, | 856 | struct iw_request_info *info, |
859 | struct iw_param *rts, char *extra) | 857 | struct iw_param *rts, char *extra) |
860 | { | 858 | { |
@@ -877,7 +875,7 @@ static int p80211wext_siwrts(netdevice_t *dev, | |||
877 | mibitem.data = rts->value; | 875 | mibitem.data = rts->value; |
878 | 876 | ||
879 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 877 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
880 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 878 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
881 | 879 | ||
882 | if (result) { | 880 | if (result) { |
883 | err = -EFAULT; | 881 | err = -EFAULT; |
@@ -888,7 +886,7 @@ exit: | |||
888 | return err; | 886 | return err; |
889 | } | 887 | } |
890 | 888 | ||
891 | static int p80211wext_giwfrag(netdevice_t *dev, | 889 | static int p80211wext_giwfrag(netdevice_t * dev, |
892 | struct iw_request_info *info, | 890 | struct iw_request_info *info, |
893 | struct iw_param *frag, char *extra) | 891 | struct iw_param *frag, char *extra) |
894 | { | 892 | { |
@@ -902,7 +900,7 @@ static int p80211wext_giwfrag(netdevice_t *dev, | |||
902 | mibitem.did = | 900 | mibitem.did = |
903 | DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold; | 901 | DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold; |
904 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 902 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
905 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 903 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
906 | 904 | ||
907 | if (result) { | 905 | if (result) { |
908 | err = -EFAULT; | 906 | err = -EFAULT; |
@@ -919,7 +917,7 @@ exit: | |||
919 | return err; | 917 | return err; |
920 | } | 918 | } |
921 | 919 | ||
922 | static int p80211wext_siwfrag(netdevice_t *dev, | 920 | static int p80211wext_siwfrag(netdevice_t * dev, |
923 | struct iw_request_info *info, | 921 | struct iw_request_info *info, |
924 | struct iw_param *frag, char *extra) | 922 | struct iw_param *frag, char *extra) |
925 | { | 923 | { |
@@ -944,7 +942,7 @@ static int p80211wext_siwfrag(netdevice_t *dev, | |||
944 | mibitem.data = frag->value; | 942 | mibitem.data = frag->value; |
945 | 943 | ||
946 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 944 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
947 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 945 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
948 | 946 | ||
949 | if (result) { | 947 | if (result) { |
950 | err = -EFAULT; | 948 | err = -EFAULT; |
@@ -963,7 +961,7 @@ exit: | |||
963 | #define IW_RETRY_SHORT IW_RETRY_MIN | 961 | #define IW_RETRY_SHORT IW_RETRY_MIN |
964 | #endif | 962 | #endif |
965 | 963 | ||
966 | static int p80211wext_giwretry(netdevice_t *dev, | 964 | static int p80211wext_giwretry(netdevice_t * dev, |
967 | struct iw_request_info *info, | 965 | struct iw_request_info *info, |
968 | struct iw_param *rrq, char *extra) | 966 | struct iw_param *rrq, char *extra) |
969 | { | 967 | { |
@@ -978,7 +976,7 @@ static int p80211wext_giwretry(netdevice_t *dev, | |||
978 | mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit; | 976 | mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit; |
979 | 977 | ||
980 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 978 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
981 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 979 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
982 | 980 | ||
983 | if (result) { | 981 | if (result) { |
984 | err = -EFAULT; | 982 | err = -EFAULT; |
@@ -992,7 +990,7 @@ static int p80211wext_giwretry(netdevice_t *dev, | |||
992 | mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit; | 990 | mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit; |
993 | 991 | ||
994 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 992 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
995 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 993 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
996 | 994 | ||
997 | if (result) { | 995 | if (result) { |
998 | err = -EFAULT; | 996 | err = -EFAULT; |
@@ -1007,7 +1005,7 @@ static int p80211wext_giwretry(netdevice_t *dev, | |||
1007 | DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime; | 1005 | DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime; |
1008 | 1006 | ||
1009 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 1007 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
1010 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1008 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1011 | 1009 | ||
1012 | if (result) { | 1010 | if (result) { |
1013 | err = -EFAULT; | 1011 | err = -EFAULT; |
@@ -1040,7 +1038,7 @@ exit: | |||
1040 | 1038 | ||
1041 | } | 1039 | } |
1042 | 1040 | ||
1043 | static int p80211wext_siwretry(netdevice_t *dev, | 1041 | static int p80211wext_siwretry(netdevice_t * dev, |
1044 | struct iw_request_info *info, | 1042 | struct iw_request_info *info, |
1045 | struct iw_param *rrq, char *extra) | 1043 | struct iw_param *rrq, char *extra) |
1046 | { | 1044 | { |
@@ -1068,7 +1066,7 @@ static int p80211wext_siwretry(netdevice_t *dev, | |||
1068 | mibitem.data = rrq->value /= 1024; | 1066 | mibitem.data = rrq->value /= 1024; |
1069 | 1067 | ||
1070 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 1068 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
1071 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1069 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1072 | 1070 | ||
1073 | if (result) { | 1071 | if (result) { |
1074 | err = -EFAULT; | 1072 | err = -EFAULT; |
@@ -1082,7 +1080,7 @@ static int p80211wext_siwretry(netdevice_t *dev, | |||
1082 | 1080 | ||
1083 | memcpy(&msg.mibattribute.data, &mibitem, | 1081 | memcpy(&msg.mibattribute.data, &mibitem, |
1084 | sizeof(mibitem)); | 1082 | sizeof(mibitem)); |
1085 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1083 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1086 | 1084 | ||
1087 | if (result) { | 1085 | if (result) { |
1088 | err = -EFAULT; | 1086 | err = -EFAULT; |
@@ -1097,7 +1095,7 @@ static int p80211wext_siwretry(netdevice_t *dev, | |||
1097 | 1095 | ||
1098 | memcpy(&msg.mibattribute.data, &mibitem, | 1096 | memcpy(&msg.mibattribute.data, &mibitem, |
1099 | sizeof(mibitem)); | 1097 | sizeof(mibitem)); |
1100 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1098 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1101 | 1099 | ||
1102 | if (result) { | 1100 | if (result) { |
1103 | err = -EFAULT; | 1101 | err = -EFAULT; |
@@ -1111,7 +1109,7 @@ exit: | |||
1111 | 1109 | ||
1112 | } | 1110 | } |
1113 | 1111 | ||
1114 | static int p80211wext_siwtxpow(netdevice_t *dev, | 1112 | static int p80211wext_siwtxpow(netdevice_t * dev, |
1115 | struct iw_request_info *info, | 1113 | struct iw_request_info *info, |
1116 | struct iw_param *rrq, char *extra) | 1114 | struct iw_param *rrq, char *extra) |
1117 | { | 1115 | { |
@@ -1134,7 +1132,7 @@ static int p80211wext_siwtxpow(netdevice_t *dev, | |||
1134 | else | 1132 | else |
1135 | mibitem.data = rrq->value; | 1133 | mibitem.data = rrq->value; |
1136 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 1134 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
1137 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1135 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1138 | 1136 | ||
1139 | if (result) { | 1137 | if (result) { |
1140 | err = -EFAULT; | 1138 | err = -EFAULT; |
@@ -1145,7 +1143,7 @@ exit: | |||
1145 | return err; | 1143 | return err; |
1146 | } | 1144 | } |
1147 | 1145 | ||
1148 | static int p80211wext_giwtxpow(netdevice_t *dev, | 1146 | static int p80211wext_giwtxpow(netdevice_t * dev, |
1149 | struct iw_request_info *info, | 1147 | struct iw_request_info *info, |
1150 | struct iw_param *rrq, char *extra) | 1148 | struct iw_param *rrq, char *extra) |
1151 | { | 1149 | { |
@@ -1160,7 +1158,7 @@ static int p80211wext_giwtxpow(netdevice_t *dev, | |||
1160 | DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel; | 1158 | DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel; |
1161 | 1159 | ||
1162 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); | 1160 | memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem)); |
1163 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1161 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1164 | 1162 | ||
1165 | if (result) { | 1163 | if (result) { |
1166 | err = -EFAULT; | 1164 | err = -EFAULT; |
@@ -1180,7 +1178,7 @@ exit: | |||
1180 | return err; | 1178 | return err; |
1181 | } | 1179 | } |
1182 | 1180 | ||
1183 | static int p80211wext_siwspy(netdevice_t *dev, | 1181 | static int p80211wext_siwspy(netdevice_t * dev, |
1184 | struct iw_request_info *info, | 1182 | struct iw_request_info *info, |
1185 | struct iw_point *srq, char *extra) | 1183 | struct iw_point *srq, char *extra) |
1186 | { | 1184 | { |
@@ -1215,7 +1213,7 @@ static int p80211wext_siwspy(netdevice_t *dev, | |||
1215 | } | 1213 | } |
1216 | 1214 | ||
1217 | /* jkriegl: from orinoco, modified */ | 1215 | /* jkriegl: from orinoco, modified */ |
1218 | static int p80211wext_giwspy(netdevice_t *dev, | 1216 | static int p80211wext_giwspy(netdevice_t * dev, |
1219 | struct iw_request_info *info, | 1217 | struct iw_request_info *info, |
1220 | struct iw_point *srq, char *extra) | 1218 | struct iw_point *srq, char *extra) |
1221 | { | 1219 | { |
@@ -1275,7 +1273,7 @@ static int prism2_result2err(int prism2_result) | |||
1275 | return err; | 1273 | return err; |
1276 | } | 1274 | } |
1277 | 1275 | ||
1278 | static int p80211wext_siwscan(netdevice_t *dev, | 1276 | static int p80211wext_siwscan(netdevice_t * dev, |
1279 | struct iw_request_info *info, | 1277 | struct iw_request_info *info, |
1280 | struct iw_point *srq, char *extra) | 1278 | struct iw_point *srq, char *extra) |
1281 | { | 1279 | { |
@@ -1308,7 +1306,7 @@ static int p80211wext_siwscan(netdevice_t *dev, | |||
1308 | msg.maxchanneltime.data = 250; | 1306 | msg.maxchanneltime.data = 250; |
1309 | msg.minchanneltime.data = 200; | 1307 | msg.minchanneltime.data = 200; |
1310 | 1308 | ||
1311 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1309 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1312 | if (result) | 1310 | if (result) |
1313 | err = prism2_result2err(msg.resultcode.data); | 1311 | err = prism2_result2err(msg.resultcode.data); |
1314 | 1312 | ||
@@ -1322,7 +1320,7 @@ exit: | |||
1322 | */ | 1320 | */ |
1323 | static char *wext_translate_bss(struct iw_request_info *info, char *current_ev, | 1321 | static char *wext_translate_bss(struct iw_request_info *info, char *current_ev, |
1324 | char *end_buf, | 1322 | char *end_buf, |
1325 | p80211msg_dot11req_scan_results_t *bss) | 1323 | p80211msg_dot11req_scan_results_t * bss) |
1326 | { | 1324 | { |
1327 | struct iw_event iwe; /* Temporary buffer */ | 1325 | struct iw_event iwe; /* Temporary buffer */ |
1328 | 1326 | ||
@@ -1406,7 +1404,7 @@ static char *wext_translate_bss(struct iw_request_info *info, char *current_ev, | |||
1406 | return current_ev; | 1404 | return current_ev; |
1407 | } | 1405 | } |
1408 | 1406 | ||
1409 | static int p80211wext_giwscan(netdevice_t *dev, | 1407 | static int p80211wext_giwscan(netdevice_t * dev, |
1410 | struct iw_request_info *info, | 1408 | struct iw_request_info *info, |
1411 | struct iw_point *srq, char *extra) | 1409 | struct iw_point *srq, char *extra) |
1412 | { | 1410 | { |
@@ -1427,7 +1425,7 @@ static int p80211wext_giwscan(netdevice_t *dev, | |||
1427 | msg.msgcode = DIDmsg_dot11req_scan_results; | 1425 | msg.msgcode = DIDmsg_dot11req_scan_results; |
1428 | msg.bssindex.data = i; | 1426 | msg.bssindex.data = i; |
1429 | 1427 | ||
1430 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1428 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1431 | if ((result != 0) || | 1429 | if ((result != 0) || |
1432 | (msg.resultcode.data != P80211ENUM_resultcode_success)) { | 1430 | (msg.resultcode.data != P80211ENUM_resultcode_success)) { |
1433 | break; | 1431 | break; |
@@ -1466,7 +1464,7 @@ static int p80211wext_set_encodeext(struct net_device *dev, | |||
1466 | int idx = encoding->flags & IW_ENCODE_INDEX; | 1464 | int idx = encoding->flags & IW_ENCODE_INDEX; |
1467 | 1465 | ||
1468 | pr_debug("set_encode_ext flags[%d] alg[%d] keylen[%d]\n", | 1466 | pr_debug("set_encode_ext flags[%d] alg[%d] keylen[%d]\n", |
1469 | ext->ext_flags, (int)ext->alg, (int)ext->key_len); | 1467 | ext->ext_flags, (int)ext->alg, (int)ext->key_len); |
1470 | 1468 | ||
1471 | if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { | 1469 | if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { |
1472 | /* set default key ? I'm not sure if this the the correct thing to do here */ | 1470 | /* set default key ? I'm not sure if this the the correct thing to do here */ |
@@ -1502,7 +1500,7 @@ static int p80211wext_set_encodeext(struct net_device *dev, | |||
1502 | memcpy(wlandev->wep_keys[idx], ext->key, ext->key_len); | 1500 | memcpy(wlandev->wep_keys[idx], ext->key, ext->key_len); |
1503 | 1501 | ||
1504 | memset(&msg, 0, sizeof(msg)); | 1502 | memset(&msg, 0, sizeof(msg)); |
1505 | pstr = (p80211item_pstr32_t *)&msg.mibattribute.data; | 1503 | pstr = (p80211item_pstr32_t *) & msg.mibattribute.data; |
1506 | memcpy(pstr->data.data, ext->key, ext->key_len); | 1504 | memcpy(pstr->data.data, ext->key, ext->key_len); |
1507 | pstr->data.len = ext->key_len; | 1505 | pstr->data.len = ext->key_len; |
1508 | switch (idx) { | 1506 | switch (idx) { |
@@ -1526,7 +1524,7 @@ static int p80211wext_set_encodeext(struct net_device *dev, | |||
1526 | break; | 1524 | break; |
1527 | } | 1525 | } |
1528 | msg.msgcode = DIDmsg_dot11req_mibset; | 1526 | msg.msgcode = DIDmsg_dot11req_mibset; |
1529 | result = p80211req_dorequest(wlandev, (u8 *)&msg); | 1527 | result = p80211req_dorequest(wlandev, (u8 *) & msg); |
1530 | pr_debug("result (%d)\n", result); | 1528 | pr_debug("result (%d)\n", result); |
1531 | } | 1529 | } |
1532 | return result; | 1530 | return result; |
@@ -1546,12 +1544,11 @@ static int p80211wext_get_encodeext(struct net_device *dev, | |||
1546 | int idx; | 1544 | int idx; |
1547 | 1545 | ||
1548 | pr_debug("get_encode_ext flags[%d] alg[%d] keylen[%d]\n", | 1546 | pr_debug("get_encode_ext flags[%d] alg[%d] keylen[%d]\n", |
1549 | ext->ext_flags, (int)ext->alg, (int)ext->key_len); | 1547 | ext->ext_flags, (int)ext->alg, (int)ext->key_len); |
1550 | 1548 | ||
1551 | max_len = encoding->length - sizeof(*ext); | 1549 | max_len = encoding->length - sizeof(*ext); |
1552 | if (max_len <= 0) { | 1550 | if (max_len <= 0) { |
1553 | pr_debug("get_encodeext max_len [%d] invalid\n", | 1551 | pr_debug("get_encodeext max_len [%d] invalid\n", max_len); |
1554 | max_len); | ||
1555 | result = -EINVAL; | 1552 | result = -EINVAL; |
1556 | goto exit; | 1553 | goto exit; |
1557 | } | 1554 | } |
@@ -1561,8 +1558,8 @@ static int p80211wext_get_encodeext(struct net_device *dev, | |||
1561 | 1558 | ||
1562 | if (idx) { | 1559 | if (idx) { |
1563 | if (idx < 1 || idx > NUM_WEPKEYS) { | 1560 | if (idx < 1 || idx > NUM_WEPKEYS) { |
1564 | pr_debug( | 1561 | pr_debug("get_encode_ext invalid key index [%d]\n", |
1565 | "get_encode_ext invalid key index [%d]\n", idx); | 1562 | idx); |
1566 | result = -EINVAL; | 1563 | result = -EINVAL; |
1567 | goto exit; | 1564 | goto exit; |
1568 | } | 1565 | } |
@@ -1593,8 +1590,7 @@ static int p80211_wext_set_iwauth(struct net_device *dev, | |||
1593 | struct iw_param *param = &wrqu->param; | 1590 | struct iw_param *param = &wrqu->param; |
1594 | int result = 0; | 1591 | int result = 0; |
1595 | 1592 | ||
1596 | pr_debug("set_iwauth flags[%d]\n", | 1593 | pr_debug("set_iwauth flags[%d]\n", (int)param->flags & IW_AUTH_INDEX); |
1597 | (int)param->flags & IW_AUTH_INDEX); | ||
1598 | 1594 | ||
1599 | switch (param->flags & IW_AUTH_INDEX) { | 1595 | switch (param->flags & IW_AUTH_INDEX) { |
1600 | case IW_AUTH_DROP_UNENCRYPTED: | 1596 | case IW_AUTH_DROP_UNENCRYPTED: |
@@ -1635,8 +1631,7 @@ static int p80211_wext_set_iwauth(struct net_device *dev, | |||
1635 | wlandev->hostwep |= HOSTWEP_SHAREDKEY; | 1631 | wlandev->hostwep |= HOSTWEP_SHAREDKEY; |
1636 | } else { | 1632 | } else { |
1637 | /* don't know what to do know */ | 1633 | /* don't know what to do know */ |
1638 | pr_debug("unknown AUTH_ALG (%d)\n", | 1634 | pr_debug("unknown AUTH_ALG (%d)\n", param->value); |
1639 | param->value); | ||
1640 | result = -EINVAL; | 1635 | result = -EINVAL; |
1641 | } | 1636 | } |
1642 | break; | 1637 | break; |
@@ -1657,8 +1652,7 @@ static int p80211_wext_get_iwauth(struct net_device *dev, | |||
1657 | struct iw_param *param = &wrqu->param; | 1652 | struct iw_param *param = &wrqu->param; |
1658 | int result = 0; | 1653 | int result = 0; |
1659 | 1654 | ||
1660 | pr_debug("get_iwauth flags[%d]\n", | 1655 | pr_debug("get_iwauth flags[%d]\n", (int)param->flags & IW_AUTH_INDEX); |
1661 | (int)param->flags & IW_AUTH_INDEX); | ||
1662 | 1656 | ||
1663 | switch (param->flags & IW_AUTH_INDEX) { | 1657 | switch (param->flags & IW_AUTH_INDEX) { |
1664 | case IW_AUTH_DROP_UNENCRYPTED: | 1658 | case IW_AUTH_DROP_UNENCRYPTED: |
@@ -1673,9 +1667,8 @@ static int p80211_wext_get_iwauth(struct net_device *dev, | |||
1673 | 1667 | ||
1674 | case IW_AUTH_80211_AUTH_ALG: | 1668 | case IW_AUTH_80211_AUTH_ALG: |
1675 | param->value = | 1669 | param->value = |
1676 | wlandev-> | 1670 | wlandev->hostwep & HOSTWEP_SHAREDKEY ? |
1677 | hostwep & HOSTWEP_SHAREDKEY ? IW_AUTH_ALG_SHARED_KEY : | 1671 | IW_AUTH_ALG_SHARED_KEY : IW_AUTH_ALG_OPEN_SYSTEM; |
1678 | IW_AUTH_ALG_OPEN_SYSTEM; | ||
1679 | break; | 1672 | break; |
1680 | 1673 | ||
1681 | default: | 1674 | default: |
@@ -1755,7 +1748,7 @@ struct iw_handler_def p80211wext_handler_def = { | |||
1755 | .get_wireless_stats = p80211wext_get_wireless_stats | 1748 | .get_wireless_stats = p80211wext_get_wireless_stats |
1756 | }; | 1749 | }; |
1757 | 1750 | ||
1758 | int p80211wext_event_associated(wlandevice_t *wlandev, int assoc) | 1751 | int p80211wext_event_associated(wlandevice_t * wlandev, int assoc) |
1759 | { | 1752 | { |
1760 | union iwreq_data data; | 1753 | union iwreq_data data; |
1761 | 1754 | ||