diff options
author | Mithlesh Thukral <mithlesh@linsyssoft.com> | 2009-05-25 09:36:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:38 -0400 |
commit | 75f49e07520d036c2a0903694fdc0bcfb5523b76 (patch) | |
tree | c049a32d58d6406aee35d2dac769ef758f5f499b /drivers/staging/wlan-ng/prism2mib.c | |
parent | 1611a52c395e6036725104af3a74a0cef8ea42b8 (diff) |
Staging: wlan-ng: Lindent cleanups
Lindent script cleanups in wlan-ng driver in the staging tree.
This is a item in the TODO list.
Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/prism2mib.c')
-rw-r--r-- | drivers/staging/wlan-ng/prism2mib.c | 158 |
1 files changed, 76 insertions, 82 deletions
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c index 7a082c17f54..f930254e1b3 100644 --- a/drivers/staging/wlan-ng/prism2mib.c +++ b/drivers/staging/wlan-ng/prism2mib.c | |||
@@ -86,65 +86,65 @@ typedef struct mibrec { | |||
86 | u16 parm1; | 86 | u16 parm1; |
87 | u16 parm2; | 87 | u16 parm2; |
88 | u16 parm3; | 88 | u16 parm3; |
89 | int (*func) (struct mibrec *mib, | 89 | int (*func) (struct mibrec * mib, |
90 | int isget, | 90 | int isget, |
91 | wlandevice_t *wlandev, | 91 | wlandevice_t * wlandev, |
92 | hfa384x_t *hw, | 92 | hfa384x_t * hw, |
93 | p80211msg_dot11req_mibset_t *msg, void *data); | 93 | p80211msg_dot11req_mibset_t * msg, void *data); |
94 | } mibrec_t; | 94 | } mibrec_t; |
95 | 95 | ||
96 | static int prism2mib_bytearea2pstr(mibrec_t *mib, | 96 | static int prism2mib_bytearea2pstr(mibrec_t * mib, |
97 | int isget, | 97 | int isget, |
98 | wlandevice_t *wlandev, | 98 | wlandevice_t * wlandev, |
99 | hfa384x_t *hw, | 99 | hfa384x_t * hw, |
100 | p80211msg_dot11req_mibset_t *msg, | 100 | p80211msg_dot11req_mibset_t * msg, |
101 | void *data); | 101 | void *data); |
102 | 102 | ||
103 | static int prism2mib_uint32(mibrec_t *mib, | 103 | static int prism2mib_uint32(mibrec_t * mib, |
104 | int isget, | 104 | int isget, |
105 | wlandevice_t *wlandev, | 105 | wlandevice_t * wlandev, |
106 | hfa384x_t *hw, | 106 | hfa384x_t * hw, |
107 | p80211msg_dot11req_mibset_t *msg, void *data); | 107 | p80211msg_dot11req_mibset_t * msg, void *data); |
108 | 108 | ||
109 | static int prism2mib_flag(mibrec_t *mib, | 109 | static int prism2mib_flag(mibrec_t * mib, |
110 | int isget, | 110 | int isget, |
111 | wlandevice_t *wlandev, | 111 | wlandevice_t * wlandev, |
112 | hfa384x_t *hw, | 112 | hfa384x_t * hw, |
113 | p80211msg_dot11req_mibset_t *msg, void *data); | 113 | p80211msg_dot11req_mibset_t * msg, void *data); |
114 | 114 | ||
115 | static int prism2mib_wepdefaultkey(mibrec_t *mib, | 115 | static int prism2mib_wepdefaultkey(mibrec_t * mib, |
116 | int isget, | 116 | int isget, |
117 | wlandevice_t *wlandev, | 117 | wlandevice_t * wlandev, |
118 | hfa384x_t *hw, | 118 | hfa384x_t * hw, |
119 | p80211msg_dot11req_mibset_t *msg, | 119 | p80211msg_dot11req_mibset_t * msg, |
120 | void *data); | 120 | void *data); |
121 | 121 | ||
122 | static int prism2mib_privacyinvoked(mibrec_t *mib, | 122 | static int prism2mib_privacyinvoked(mibrec_t * mib, |
123 | int isget, | 123 | int isget, |
124 | wlandevice_t *wlandev, | 124 | wlandevice_t * wlandev, |
125 | hfa384x_t *hw, | 125 | hfa384x_t * hw, |
126 | p80211msg_dot11req_mibset_t *msg, | 126 | p80211msg_dot11req_mibset_t * msg, |
127 | void *data); | 127 | void *data); |
128 | 128 | ||
129 | static int prism2mib_excludeunencrypted(mibrec_t *mib, | 129 | static int prism2mib_excludeunencrypted(mibrec_t * mib, |
130 | int isget, | 130 | int isget, |
131 | wlandevice_t *wlandev, | 131 | wlandevice_t * wlandev, |
132 | hfa384x_t *hw, | 132 | hfa384x_t * hw, |
133 | p80211msg_dot11req_mibset_t *msg, | 133 | p80211msg_dot11req_mibset_t * msg, |
134 | void *data); | 134 | void *data); |
135 | 135 | ||
136 | static int prism2mib_fragmentationthreshold(mibrec_t *mib, | 136 | static int prism2mib_fragmentationthreshold(mibrec_t * mib, |
137 | int isget, | 137 | int isget, |
138 | wlandevice_t *wlandev, | 138 | wlandevice_t * wlandev, |
139 | hfa384x_t *hw, | 139 | hfa384x_t * hw, |
140 | p80211msg_dot11req_mibset_t *msg, | 140 | p80211msg_dot11req_mibset_t * msg, |
141 | void *data); | 141 | void *data); |
142 | 142 | ||
143 | static int prism2mib_priv(mibrec_t *mib, | 143 | static int prism2mib_priv(mibrec_t * mib, |
144 | int isget, | 144 | int isget, |
145 | wlandevice_t *wlandev, | 145 | wlandevice_t * wlandev, |
146 | hfa384x_t *hw, | 146 | hfa384x_t * hw, |
147 | p80211msg_dot11req_mibset_t *msg, void *data); | 147 | p80211msg_dot11req_mibset_t * msg, void *data); |
148 | 148 | ||
149 | static mibrec_t mibtab[] = { | 149 | static mibrec_t mibtab[] = { |
150 | 150 | ||
@@ -258,7 +258,7 @@ static mibrec_t mibtab[] = { | |||
258 | * interrupt | 258 | * interrupt |
259 | ----------------------------------------------------------------*/ | 259 | ----------------------------------------------------------------*/ |
260 | 260 | ||
261 | int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp) | 261 | int prism2mgmt_mibset_mibget(wlandevice_t * wlandev, void *msgp) |
262 | { | 262 | { |
263 | hfa384x_t *hw = wlandev->priv; | 263 | hfa384x_t *hw = wlandev->priv; |
264 | int result, isget; | 264 | int result, isget; |
@@ -330,8 +330,7 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp) | |||
330 | 330 | ||
331 | if (msg->resultcode.data == P80211ENUM_resultcode_success) { | 331 | if (msg->resultcode.data == P80211ENUM_resultcode_success) { |
332 | if (result != 0) { | 332 | if (result != 0) { |
333 | pr_debug("get/set failure, result=%d\n", | 333 | pr_debug("get/set failure, result=%d\n", result); |
334 | result); | ||
335 | msg->resultcode.data = | 334 | msg->resultcode.data = |
336 | P80211ENUM_resultcode_implementation_failure; | 335 | P80211ENUM_resultcode_implementation_failure; |
337 | } else { | 336 | } else { |
@@ -373,11 +372,11 @@ done: | |||
373 | * | 372 | * |
374 | ----------------------------------------------------------------*/ | 373 | ----------------------------------------------------------------*/ |
375 | 374 | ||
376 | static int prism2mib_bytearea2pstr(mibrec_t *mib, | 375 | static int prism2mib_bytearea2pstr(mibrec_t * mib, |
377 | int isget, | 376 | int isget, |
378 | wlandevice_t *wlandev, | 377 | wlandevice_t * wlandev, |
379 | hfa384x_t *hw, | 378 | hfa384x_t * hw, |
380 | p80211msg_dot11req_mibset_t *msg, | 379 | p80211msg_dot11req_mibset_t * msg, |
381 | void *data) | 380 | void *data) |
382 | { | 381 | { |
383 | int result; | 382 | int result; |
@@ -423,11 +422,11 @@ static int prism2mib_bytearea2pstr(mibrec_t *mib, | |||
423 | * | 422 | * |
424 | ----------------------------------------------------------------*/ | 423 | ----------------------------------------------------------------*/ |
425 | 424 | ||
426 | static int prism2mib_uint32(mibrec_t *mib, | 425 | static int prism2mib_uint32(mibrec_t * mib, |
427 | int isget, | 426 | int isget, |
428 | wlandevice_t *wlandev, | 427 | wlandevice_t * wlandev, |
429 | hfa384x_t *hw, | 428 | hfa384x_t * hw, |
430 | p80211msg_dot11req_mibset_t *msg, void *data) | 429 | p80211msg_dot11req_mibset_t * msg, void *data) |
431 | { | 430 | { |
432 | int result; | 431 | int result; |
433 | u32 *uint32 = (u32 *) data; | 432 | u32 *uint32 = (u32 *) data; |
@@ -470,11 +469,11 @@ static int prism2mib_uint32(mibrec_t *mib, | |||
470 | * | 469 | * |
471 | ----------------------------------------------------------------*/ | 470 | ----------------------------------------------------------------*/ |
472 | 471 | ||
473 | static int prism2mib_flag(mibrec_t *mib, | 472 | static int prism2mib_flag(mibrec_t * mib, |
474 | int isget, | 473 | int isget, |
475 | wlandevice_t *wlandev, | 474 | wlandevice_t * wlandev, |
476 | hfa384x_t *hw, | 475 | hfa384x_t * hw, |
477 | p80211msg_dot11req_mibset_t *msg, void *data) | 476 | p80211msg_dot11req_mibset_t * msg, void *data) |
478 | { | 477 | { |
479 | int result; | 478 | int result; |
480 | u32 *uint32 = (u32 *) data; | 479 | u32 *uint32 = (u32 *) data; |
@@ -527,11 +526,11 @@ static int prism2mib_flag(mibrec_t *mib, | |||
527 | * | 526 | * |
528 | ----------------------------------------------------------------*/ | 527 | ----------------------------------------------------------------*/ |
529 | 528 | ||
530 | static int prism2mib_wepdefaultkey(mibrec_t *mib, | 529 | static int prism2mib_wepdefaultkey(mibrec_t * mib, |
531 | int isget, | 530 | int isget, |
532 | wlandevice_t *wlandev, | 531 | wlandevice_t * wlandev, |
533 | hfa384x_t *hw, | 532 | hfa384x_t * hw, |
534 | p80211msg_dot11req_mibset_t *msg, | 533 | p80211msg_dot11req_mibset_t * msg, |
535 | void *data) | 534 | void *data) |
536 | { | 535 | { |
537 | int result; | 536 | int result; |
@@ -577,11 +576,11 @@ static int prism2mib_wepdefaultkey(mibrec_t *mib, | |||
577 | * | 576 | * |
578 | ----------------------------------------------------------------*/ | 577 | ----------------------------------------------------------------*/ |
579 | 578 | ||
580 | static int prism2mib_privacyinvoked(mibrec_t *mib, | 579 | static int prism2mib_privacyinvoked(mibrec_t * mib, |
581 | int isget, | 580 | int isget, |
582 | wlandevice_t *wlandev, | 581 | wlandevice_t * wlandev, |
583 | hfa384x_t *hw, | 582 | hfa384x_t * hw, |
584 | p80211msg_dot11req_mibset_t *msg, | 583 | p80211msg_dot11req_mibset_t * msg, |
585 | void *data) | 584 | void *data) |
586 | { | 585 | { |
587 | int result; | 586 | int result; |
@@ -623,11 +622,11 @@ static int prism2mib_privacyinvoked(mibrec_t *mib, | |||
623 | * | 622 | * |
624 | ----------------------------------------------------------------*/ | 623 | ----------------------------------------------------------------*/ |
625 | 624 | ||
626 | static int prism2mib_excludeunencrypted(mibrec_t *mib, | 625 | static int prism2mib_excludeunencrypted(mibrec_t * mib, |
627 | int isget, | 626 | int isget, |
628 | wlandevice_t *wlandev, | 627 | wlandevice_t * wlandev, |
629 | hfa384x_t *hw, | 628 | hfa384x_t * hw, |
630 | p80211msg_dot11req_mibset_t *msg, | 629 | p80211msg_dot11req_mibset_t * msg, |
631 | void *data) | 630 | void *data) |
632 | { | 631 | { |
633 | int result; | 632 | int result; |
@@ -662,11 +661,11 @@ static int prism2mib_excludeunencrypted(mibrec_t *mib, | |||
662 | * | 661 | * |
663 | ----------------------------------------------------------------*/ | 662 | ----------------------------------------------------------------*/ |
664 | 663 | ||
665 | static int prism2mib_fragmentationthreshold(mibrec_t *mib, | 664 | static int prism2mib_fragmentationthreshold(mibrec_t * mib, |
666 | int isget, | 665 | int isget, |
667 | wlandevice_t *wlandev, | 666 | wlandevice_t * wlandev, |
668 | hfa384x_t *hw, | 667 | hfa384x_t * hw, |
669 | p80211msg_dot11req_mibset_t *msg, | 668 | p80211msg_dot11req_mibset_t * msg, |
670 | void *data) | 669 | void *data) |
671 | { | 670 | { |
672 | int result; | 671 | int result; |
@@ -711,11 +710,11 @@ static int prism2mib_fragmentationthreshold(mibrec_t *mib, | |||
711 | * | 710 | * |
712 | ----------------------------------------------------------------*/ | 711 | ----------------------------------------------------------------*/ |
713 | 712 | ||
714 | static int prism2mib_priv(mibrec_t *mib, | 713 | static int prism2mib_priv(mibrec_t * mib, |
715 | int isget, | 714 | int isget, |
716 | wlandevice_t *wlandev, | 715 | wlandevice_t * wlandev, |
717 | hfa384x_t *hw, | 716 | hfa384x_t * hw, |
718 | p80211msg_dot11req_mibset_t *msg, void *data) | 717 | p80211msg_dot11req_mibset_t * msg, void *data) |
719 | { | 718 | { |
720 | p80211pstrd_t *pstr = (p80211pstrd_t *) data; | 719 | p80211pstrd_t *pstr = (p80211pstrd_t *) data; |
721 | 720 | ||
@@ -727,7 +726,7 @@ static int prism2mib_priv(mibrec_t *mib, | |||
727 | if (isget) { | 726 | if (isget) { |
728 | hfa384x_drvr_getconfig(hw, | 727 | hfa384x_drvr_getconfig(hw, |
729 | HFA384x_RID_CNFWPADATA, | 728 | HFA384x_RID_CNFWPADATA, |
730 | (u8 *)&wpa, | 729 | (u8 *) & wpa, |
731 | sizeof(wpa)); | 730 | sizeof(wpa)); |
732 | pstr->len = le16_to_cpu(wpa.datalen); | 731 | pstr->len = le16_to_cpu(wpa.datalen); |
733 | memcpy(pstr->data, wpa.data, pstr->len); | 732 | memcpy(pstr->data, wpa.data, pstr->len); |
@@ -738,7 +737,7 @@ static int prism2mib_priv(mibrec_t *mib, | |||
738 | result = | 737 | result = |
739 | hfa384x_drvr_setconfig(hw, | 738 | hfa384x_drvr_setconfig(hw, |
740 | HFA384x_RID_CNFWPADATA, | 739 | HFA384x_RID_CNFWPADATA, |
741 | (u8 *)&wpa, | 740 | (u8 *) & wpa, |
742 | sizeof(wpa)); | 741 | sizeof(wpa)); |
743 | } | 742 | } |
744 | break; | 743 | break; |
@@ -765,7 +764,7 @@ static int prism2mib_priv(mibrec_t *mib, | |||
765 | * | 764 | * |
766 | ----------------------------------------------------------------*/ | 765 | ----------------------------------------------------------------*/ |
767 | 766 | ||
768 | void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) | 767 | void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t * bytestr, p80211pstrd_t * pstr) |
769 | { | 768 | { |
770 | bytestr->len = cpu_to_le16((u16) (pstr->len)); | 769 | bytestr->len = cpu_to_le16((u16) (pstr->len)); |
771 | memcpy(bytestr->data, pstr->data, pstr->len); | 770 | memcpy(bytestr->data, pstr->data, pstr->len); |
@@ -786,7 +785,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) | |||
786 | * | 785 | * |
787 | ----------------------------------------------------------------*/ | 786 | ----------------------------------------------------------------*/ |
788 | 787 | ||
789 | void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr) | 788 | void prism2mgmt_pstr2bytearea(u8 * bytearea, p80211pstrd_t * pstr) |
790 | { | 789 | { |
791 | memcpy(bytearea, pstr->data, pstr->len); | 790 | memcpy(bytearea, pstr->data, pstr->len); |
792 | } | 791 | } |
@@ -806,7 +805,7 @@ void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr) | |||
806 | * | 805 | * |
807 | ----------------------------------------------------------------*/ | 806 | ----------------------------------------------------------------*/ |
808 | 807 | ||
809 | void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) | 808 | void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t * bytestr, p80211pstrd_t * pstr) |
810 | { | 809 | { |
811 | pstr->len = (u8) (le16_to_cpu((u16) (bytestr->len))); | 810 | pstr->len = (u8) (le16_to_cpu((u16) (bytestr->len))); |
812 | memcpy(pstr->data, bytestr->data, pstr->len); | 811 | memcpy(pstr->data, bytestr->data, pstr->len); |
@@ -827,13 +826,8 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) | |||
827 | * | 826 | * |
828 | ----------------------------------------------------------------*/ | 827 | ----------------------------------------------------------------*/ |
829 | 828 | ||
830 | void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len) | 829 | void prism2mgmt_bytearea2pstr(u8 * bytearea, p80211pstrd_t * pstr, int len) |
831 | { | 830 | { |
832 | pstr->len = (u8) len; | 831 | pstr->len = (u8) len; |
833 | memcpy(pstr->data, bytearea, len); | 832 | memcpy(pstr->data, bytearea, len); |
834 | } | 833 | } |
835 | |||
836 | |||
837 | |||
838 | |||
839 | |||