nfs: disintegrate UAPI for nfs

[~andy/linux] / drivers / staging / wlan-ng / p80211req.c

diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index ccb060142b3a414fcb4323ae4d443f89a5554dda..cdfd808d6854bf2a81d14794914d869cabcfa9f1 100644 (file)
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -73,7 +73,7 @@
 #include "p80211req.h"
 
 static void p80211req_handlemsg(wlandevice_t *wlandev, struct p80211msg *msg);
-static int p80211req_mibset_mibget(wlandevice_t *wlandev,
+static void p80211req_mibset_mibget(wlandevice_t *wlandev,
                                   struct p80211msg_dot11req_mibget *mib_msg,
                                   int isget);
 
@@ -177,7 +177,7 @@ static void p80211req_handlemsg(wlandevice_t *wlandev, struct p80211msg *msg)
        }                       /* switch msg->msgcode */
 }
 
-static int p80211req_mibset_mibget(wlandevice_t *wlandev,
+static void p80211req_mibset_mibget(wlandevice_t *wlandev,
                                   struct p80211msg_dot11req_mibget *mib_msg,
                                   int isget)
 {
@@ -187,76 +187,65 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
 
        switch (mibitem->did) {
        case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0:{
-                       if (!isget)
-                               wep_change_key(wlandev, 0, key, pstr->len);
-                       break;
-               }
+               if (!isget)
+                       wep_change_key(wlandev, 0, key, pstr->len);
+       break;
+       }
        case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey1:{
-                       if (!isget)
-                               wep_change_key(wlandev, 1, key, pstr->len);
-                       break;
-               }
+               if (!isget)
+                       wep_change_key(wlandev, 1, key, pstr->len);
+       break;
+       }
        case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey2:{
-                       if (!isget)
-                               wep_change_key(wlandev, 2, key, pstr->len);
-                       break;
-               }
+               if (!isget)
+                       wep_change_key(wlandev, 2, key, pstr->len);
+       break;
+       }
        case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey3:{
-                       if (!isget)
-                               wep_change_key(wlandev, 3, key, pstr->len);
-                       break;
-               }
+               if (!isget)
+                       wep_change_key(wlandev, 3, key, pstr->len);
+       break;
+       }
        case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID:{
-                       u32 *data = (u32 *) mibitem->data;
-
-                       if (isget) {
-                               *data =
-                                   wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK;
-                       } else {
-                               wlandev->hostwep &= ~(HOSTWEP_DEFAULTKEY_MASK);
+               u32 *data = (u32 *) mibitem->data;
 
-                               wlandev->hostwep |=
-                                   (*data & HOSTWEP_DEFAULTKEY_MASK);
-                       }
-                       break;
+               if (isget) {
+                       *data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK;
+               } else {
+                       wlandev->hostwep &= ~(HOSTWEP_DEFAULTKEY_MASK);
+                       wlandev->hostwep |= (*data & HOSTWEP_DEFAULTKEY_MASK);
                }
+       break;
+       }
        case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked:{
-                       u32 *data = (u32 *) mibitem->data;
-
-                       if (isget) {
-                               if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED)
-                                       *data = P80211ENUM_truth_true;
-                               else
-                                       *data = P80211ENUM_truth_false;
-                       } else {
-                               wlandev->hostwep &= ~(HOSTWEP_PRIVACYINVOKED);
-                               if (*data == P80211ENUM_truth_true)
-                                       wlandev->hostwep |=
-                                           HOSTWEP_PRIVACYINVOKED;
-                       }
-                       break;
+               u32 *data = (u32 *) mibitem->data;
+
+               if (isget) {
+                       if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED)
+                               *data = P80211ENUM_truth_true;
+                       else
+                               *data = P80211ENUM_truth_false;
+               } else {
+                       wlandev->hostwep &= ~(HOSTWEP_PRIVACYINVOKED);
+                       if (*data == P80211ENUM_truth_true)
+                               wlandev->hostwep |= HOSTWEP_PRIVACYINVOKED;
                }
+       break;
+       }
        case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted:{
-                       u32 *data = (u32 *) mibitem->data;
-
-                       if (isget) {
-                               if (wlandev->hostwep &
-                                   HOSTWEP_EXCLUDEUNENCRYPTED)
-                                       *data = P80211ENUM_truth_true;
-                               else
-                                       *data = P80211ENUM_truth_false;
-                       } else {
-                               wlandev->hostwep &=
-                                   ~(HOSTWEP_EXCLUDEUNENCRYPTED);
-                               if (*data == P80211ENUM_truth_true)
-                                       wlandev->hostwep |=
-                                           HOSTWEP_EXCLUDEUNENCRYPTED;
-                       }
-                       break;
+               u32 *data = (u32 *) mibitem->data;
+
+               if (isget) {
+                       if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED)
+                               *data = P80211ENUM_truth_true;
+                       else
+                               *data = P80211ENUM_truth_false;
+               } else {
+                       wlandev->hostwep &= ~(HOSTWEP_EXCLUDEUNENCRYPTED);
+                       if (*data == P80211ENUM_truth_true)
+                               wlandev->hostwep |= HOSTWEP_EXCLUDEUNENCRYPTED;
                }
-       default:
-               ;
+       break;
+       }
        }
-
-       return 0;
 }