[PATCH v2] Staging: wlan-ng: removed duplicate code in p80211req.c

[Claudiu Beznea]

This patch removes duplicate code in p80211req_mibset_mibget()
by adding p80211req_handle_action() function.

Changes since v1:
Removed prototype of p80211req_handle_action() from the prototype
list and add directly the function definition.

Signed-off-by: Claudiu Beznea <claudiu.bez...@gmail.com>
---
 drivers/staging/wlan-ng/p80211req.c | 39 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211req.c 
b/drivers/staging/wlan-ng/p80211req.c
index 4b84b56..d830417 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -77,6 +77,21 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev,
                                   struct p80211msg_dot11req_mibget *mib_msg,
                                   int isget);
 
+static void p80211req_handle_action(struct wlandevice *wlandev, u32 *data,
+                                   int isget, u32 flag)
+{
+       if (isget) {
+               if (wlandev->hostwep & flag)
+                       *data = P80211ENUM_truth_true;
+               else
+                       *data = P80211ENUM_truth_false;
+       } else {
+               wlandev->hostwep &= ~flag;
+               if (*data == P80211ENUM_truth_true)
+                       wlandev->hostwep |= flag;
+       }
+}
+
 /*----------------------------------------------------------------
 * p80211req_dorequest
 *
@@ -219,31 +234,15 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev,
        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;
-               }
+               p80211req_handle_action(wlandev, data, isget,
+                                       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;
-               }
+               p80211req_handle_action(wlandev, data, isget,
+                                       HOSTWEP_EXCLUDEUNENCRYPTED);
        break;
        }
        }
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel