Commit eeeeacd8 authored by Tim Collier's avatar Tim Collier Committed by Greg Kroah-Hartman
Browse files

staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID in p80211metadef.h 



Rename DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID in
p80211metadef.h to DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID to fix
"Avoid CamelCase" message from checkpatch and conform to the coding
style guidelines. Also shorten name by removing repeated use of
"DOT11" to ease readability and reduce long lines.

Signed-off-by: default avatarTim Collier <osdevtc@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 184fcaa1

drivers/staging/wlan-ng/cfg80211.c

+3 −3
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, 
	}



	if (prism2_domibset_uint32(wlandev,

				   DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,

				   DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,

				   key_index))

		return -EFAULT;
@@ -234,7 +234,7 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev, 
	int result = 0;



	result = prism2_domibset_uint32(wlandev,

		DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,

		DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,

		key_index);



	if (result)
@@ -482,7 +482,7 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev, 
			}



			result = prism2_domibset_uint32(wlandev,

				DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,

				DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,

				sme->key_idx);

			if (result)

				goto exit;

drivers/staging/wlan-ng/p80211metadef.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 
			(P80211DID_MKSECTION(1) | \

			P80211DID_MKGROUP(6) | \

			P80211DID_MKITEM(1) | 0x18000000)

#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID \

#define DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID \

			(P80211DID_MKSECTION(1) | \

			P80211DID_MKGROUP(6) | \

			P80211DID_MKITEM(2) | 0x18000000)

drivers/staging/wlan-ng/p80211req.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev, 
				       key, pstr->len);

		break;



	case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID:{

	case DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID:{

		u32 *data = (u32 *)mibitem->data;



		if (isget) {

drivers/staging/wlan-ng/prism2mib.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static struct mibrec mibtab[] = { 
	 F_STA | F_READ | F_WRITE,

	 HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_PRIVINVOKED, 0,

	 prism2mib_privacyinvoked},

	{DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,

	{DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,

	 F_STA | F_READ | F_WRITE,

	 HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,

	 prism2mib_uint32},

CRA Git | Maintained and supported by SUSTech CRA and CCSE