* [PATCH] Staging: wlan-ng: removed duplicate code in p80211req.c
@ 2016-08-24 21:55 Claudiu Beznea
2016-08-24 22:37 ` Joe Perches
0 siblings, 1 reply; 2+ messages in thread
From: Claudiu Beznea @ 2016-08-24 21:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Claudiu Beznea
This patch removes duplicate code in p80211req_mibset_mibget()
by adding p80211req_handle_action() function.
Signed-off-by: Claudiu Beznea <claudiu.beznea@gmail.com>
---
drivers/staging/wlan-ng/p80211req.c | 41 +++++++++++++++++++------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index 4b84b56..7e91dfd 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -76,6 +76,8 @@ static void p80211req_handlemsg(wlandevice_t *wlandev, struct p80211msg *msg);
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);
/*----------------------------------------------------------------
* p80211req_dorequest
@@ -219,32 +221,31 @@ 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;
}
}
}
+
+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;
+ }
+}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Staging: wlan-ng: removed duplicate code in p80211req.c
2016-08-24 21:55 [PATCH] Staging: wlan-ng: removed duplicate code in p80211req.c Claudiu Beznea
@ 2016-08-24 22:37 ` Joe Perches
0 siblings, 0 replies; 2+ messages in thread
From: Joe Perches @ 2016-08-24 22:37 UTC (permalink / raw)
To: Claudiu Beznea, gregkh; +Cc: devel, linux-kernel
On Thu, 2016-08-25 at 00:55 +0300, Claudiu Beznea wrote:
> This patch removes duplicate code in p80211req_mibset_mibget()
> by adding p80211req_handle_action() function.
Better would be to remove the prototype and move the
new static to the location of the prototype.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-24 22:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-24 21:55 [PATCH] Staging: wlan-ng: removed duplicate code in p80211req.c Claudiu Beznea
2016-08-24 22:37 ` Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).