Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f479125 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: removed duplicate code in p80211req.c 



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: default avatarClaudiu Beznea <claudiu.beznea@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37f92cf0

drivers/staging/wlan-ng/p80211req.c

+19 −20
Original line number Diff line number Diff line
@@ -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

*
@@ -209,31 +224,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;

	}

	}