drivers/staging/wlan-ng/p80211metadef.h was generated before
submitting to Linux, so it contains long constants and
ugly code.
- Shorten macro names for DIDMSG_*/DIDMIB_* constants generators
- Drop repeating prefixes from DIDMSG_*/DIDMIB_* constants
- Use abbreviations where spelling full words is unnecessary
(OPERATIONTABLE -> OPTABLE, TRANSMISSION->TX etc)
No functional changes.
Signed-off-by: Mikhail Gusarov <dotted...@dottedmag.net>
---
drivers/staging/wlan-ng/cfg80211.c | 48 +++---
drivers/staging/wlan-ng/p80211metadef.h | 278 +++++++++-----------------------
drivers/staging/wlan-ng/p80211netdev.c | 8 +-
drivers/staging/wlan-ng/p80211req.c | 28 ++--
drivers/staging/wlan-ng/p80211types.h | 32 +---
drivers/staging/wlan-ng/prism2fw.c | 32 ++--
drivers/staging/wlan-ng/prism2mib.c | 40 ++---
drivers/staging/wlan-ng/prism2sta.c | 34 ++--
8 files changed, 182 insertions(+), 318 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 8a862f718d5c..5b88803dfbc9 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -77,7 +77,7 @@ static int prism2_domibset_uint32(struct wlandevice *wlandev,
struct p80211item_uint32 *mibitem =
(struct p80211item_uint32 *)&msg.mibattribute.data;
- msg.msgcode = DIDMSG_DOT11REQ_MIBSET;
+ msg.msgcode = REQ_MIBSET;
mibitem->did = did;
mibitem->data = data;
@@ -91,7 +91,7 @@ static int prism2_domibset_pstr32(struct wlandevice *wlandev,
struct p80211item_pstr32 *mibitem =
(struct p80211item_pstr32 *)&msg.mibattribute.data;
- msg.msgcode = DIDMSG_DOT11REQ_MIBSET;
+ msg.msgcode = REQ_MIBSET;
mibitem->did = did;
mibitem->data.len = len;
memcpy(mibitem->data.data, data, len);
@@ -130,7 +130,7 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy,
/* Set Operation mode to the PORT TYPE RID */
result = prism2_domibset_uint32(wlandev,
- DIDMIB_P2_STATIC_CNFPORTTYPE,
+ P2_STATIC_CNFPORTTYPE,
data);
if (result)
@@ -159,12 +159,12 @@ static int prism2_add_key(struct wiphy *wiphy, struct
net_device *dev,
}
if (prism2_domibset_uint32(wlandev,
- DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
+ SMT_PRIVTABLE_WEPDEFAULTKEYID,
key_index))
return -EFAULT;
/* send key to driver */
- did = didmib_dot11smt_wepdefaultkeystable_key(key_index + 1);
+ did = smt_wepdefaultkeystable_key(key_index + 1);
if (prism2_domibset_pstr32(wlandev, did, params->key_len, params->key))
return -EFAULT;
@@ -217,7 +217,7 @@ static int prism2_del_key(struct wiphy *wiphy, struct
net_device *dev,
return -EINVAL;
/* send key to driver */
- did = didmib_dot11smt_wepdefaultkeystable_key(key_index + 1);
+ did = smt_wepdefaultkeystable_key(key_index + 1);
result = prism2_domibset_pstr32(wlandev, did, 13, "0000000000000");
if (result)
@@ -235,7 +235,7 @@ static int prism2_set_default_key(struct wiphy *wiphy,
struct net_device *dev,
int result = 0;
result = prism2_domibset_uint32(wlandev,
- DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
+ SMT_PRIVTABLE_WEPDEFAULTKEYID,
key_index);
if (result)
@@ -257,7 +257,7 @@ static int prism2_get_station(struct wiphy *wiphy, struct
net_device *dev,
return -EOPNOTSUPP;
/* build request message */
- quality.msgcode = DIDMSG_LNXREQ_COMMSQUALITY;
+ quality.msgcode = LNXREQ_COMMSQUALITY;
quality.dbm.data = P80211ENUM_truth_true;
quality.dbm.status = P80211ENUM_msgitem_status_data_ok;
@@ -312,7 +312,7 @@ static int prism2_scan(struct wiphy *wiphy,
priv->scan_request = request;
memset(&msg1, 0x00, sizeof(msg1));
- msg1.msgcode = DIDMSG_DOT11REQ_SCAN;
+ msg1.msgcode = REQ_SCAN;
msg1.bsstype.data = P80211ENUM_bsstype_any;
memset(&msg1.bssid.data.data, 0xFF, sizeof(msg1.bssid.data.data));
@@ -351,7 +351,7 @@ static int prism2_scan(struct wiphy *wiphy,
int freq;
memset(&msg2, 0, sizeof(msg2));
- msg2.msgcode = DIDMSG_DOT11REQ_SCAN_RESULTS;
+ msg2.msgcode = REQ_SCAN_RESULTS;
msg2.bssindex.data = i;
result = p80211req_dorequest(wlandev, (u8 *)&msg2);
@@ -411,7 +411,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32
changed)
data = wiphy->rts_threshold;
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD,
+ MAC_OPTABLE_RTSTHRESHOLD,
data);
if (result) {
err = -EFAULT;
@@ -426,7 +426,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32
changed)
data = wiphy->frag_threshold;
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD,
+ MAC_OPTABLE_FRAGTHRESHOLD,
data);
if (result) {
err = -EFAULT;
@@ -456,7 +456,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
if (channel) {
chan = ieee80211_frequency_to_channel(channel->center_freq);
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
+ PHY_DSSSTABLE_CURRCHAN,
chan);
if (result)
goto exit;
@@ -483,13 +483,13 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
}
result = prism2_domibset_uint32(wlandev,
- DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
+ SMT_PRIVTABLE_WEPDEFAULTKEYID,
sme->key_idx);
if (result)
goto exit;
/* send key to driver */
- did = didmib_dot11smt_wepdefaultkeystable_key(
+ did = smt_wepdefaultkeystable_key(
sme->key_idx + 1);
result = prism2_domibset_pstr32(wlandev,
did, sme->key_len,
@@ -503,13 +503,13 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
* seems reasonable anyways
*/
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
+ SMT_PRIVTABLE_PRIVACYINVOKED,
P80211ENUM_truth_true);
if (result)
goto exit;
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
+ SMT_PRIVTABLE_EXUNENCRYPTED,
P80211ENUM_truth_true);
if (result)
goto exit;
@@ -519,13 +519,13 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
* and exclude unencrypted
*/
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
+ SMT_PRIVTABLE_PRIVACYINVOKED,
P80211ENUM_truth_false);
if (result)
goto exit;
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
+ SMT_PRIVTABLE_EXUNENCRYPTED,
P80211ENUM_truth_false);
if (result)
goto exit;
@@ -534,7 +534,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
/* Now do the actual join. Note there is no way that I can
* see to request a specific bssid
*/
- msg_join.msgcode = DIDMSG_LNXREQ_AUTOJOIN;
+ msg_join.msgcode = LNXREQ_AUTOJOIN;
memcpy(msg_join.ssid.data.data, sme->ssid, length);
msg_join.ssid.data.len = length;
@@ -557,7 +557,7 @@ static int prism2_disconnect(struct wiphy *wiphy, struct
net_device *dev,
int err = 0;
/* Do a join, with a bogus ssid. Thats the only way I can think of */
- msg_join.msgcode = DIDMSG_LNXREQ_AUTOJOIN;
+ msg_join.msgcode = LNXREQ_AUTOJOIN;
memcpy(msg_join.ssid.data.data, "---", 3);
msg_join.ssid.data.len = 3;
@@ -596,7 +596,7 @@ static int prism2_set_tx_power(struct wiphy *wiphy, struct
wireless_dev *wdev,
data = MBM_TO_DBM(mbm);
result = prism2_domibset_uint32(wlandev,
- DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
+ PHY_TXPOWERTABLE_CURRTXPOWERLEVEL,
data);
if (result) {
@@ -619,8 +619,8 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct
wireless_dev *wdev,
int err = 0;
mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data;
- msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
- mibitem->did = DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL;
+ msg.msgcode = REQ_MIBGET;
+ mibitem->did = PHY_TXPOWERTABLE_CURRTXPOWERLEVEL;
result = p80211req_dorequest(wlandev, (u8 *)&msg);
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 1b91b64c12ed..3b05d1bdd644 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -47,202 +47,84 @@
#ifndef _P80211MKMETADEF_H
#define _P80211MKMETADEF_H
-#define DIDMSG_DOT11REQ_MIBGET \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(1))
-#define DIDMSG_DOT11REQ_MIBGET_MIBATTRIBUTE \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(1) | 0x00000000)
-#define DIDMSG_DOT11REQ_MIBGET_RESULTCODE \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(2) | 0x00000000)
-#define DIDMSG_DOT11REQ_MIBSET \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(2))
-#define DIDMSG_DOT11REQ_MIBSET_MIBATTRIBUTE \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(2) | \
- P80211DID_MKITEM(1) | 0x00000000)
-#define DIDMSG_DOT11REQ_MIBSET_RESULTCODE \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(2) | \
- P80211DID_MKITEM(2) | 0x00000000)
-#define DIDMSG_DOT11REQ_SCAN \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(4))
-#define DIDMSG_DOT11REQ_SCAN_RESULTS \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(5))
-#define DIDMSG_DOT11REQ_START \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(13))
-#define DIDMSG_DOT11IND_AUTHENTICATE \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1))
-#define DIDMSG_DOT11IND_ASSOCIATE \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(3))
-#define DIDMSG_LNXREQ_IFSTATE \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(1))
-#define DIDMSG_LNXREQ_WLANSNIFF \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(2))
-#define DIDMSG_LNXREQ_HOSTWEP \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(3))
-#define DIDMSG_LNXREQ_COMMSQUALITY \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(4))
-#define DIDMSG_LNXREQ_AUTOJOIN \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(5))
-#define DIDMSG_P2REQ_READPDA \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(2))
-#define DIDMSG_P2REQ_READPDA_PDA \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(2) | \
- P80211DID_MKITEM(1) | 0x00000000)
-#define DIDMSG_P2REQ_READPDA_RESULTCODE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(2) | \
- P80211DID_MKITEM(2) | 0x00000000)
-#define DIDMSG_P2REQ_RAMDL_STATE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(11))
-#define DIDMSG_P2REQ_RAMDL_STATE_ENABLE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(11) | \
- P80211DID_MKITEM(1) | 0x00000000)
-#define DIDMSG_P2REQ_RAMDL_STATE_EXEADDR \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(11) | \
- P80211DID_MKITEM(2) | 0x00000000)
-#define DIDMSG_P2REQ_RAMDL_STATE_RESULTCODE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(11) | \
- P80211DID_MKITEM(3) | 0x00000000)
-#define DIDMSG_P2REQ_RAMDL_WRITE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(12))
-#define DIDMSG_P2REQ_RAMDL_WRITE_ADDR \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(12) | \
- P80211DID_MKITEM(1) | 0x00000000)
-#define DIDMSG_P2REQ_RAMDL_WRITE_LEN \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(12) | \
- P80211DID_MKITEM(2) | 0x00000000)
-#define DIDMSG_P2REQ_RAMDL_WRITE_DATA \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(12) | \
- P80211DID_MKITEM(3) | 0x00000000)
-#define DIDMSG_P2REQ_RAMDL_WRITE_RESULTCODE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(12) | \
- P80211DID_MKITEM(4) | 0x00000000)
-#define DIDMSG_P2REQ_FLASHDL_STATE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(13))
-#define DIDMSG_P2REQ_FLASHDL_WRITE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(14))
-#define DIDMIB_CAT_DOT11SMT \
- P80211DID_MKSECTION(1)
-#define DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(4))
-#define didmib_dot11smt_wepdefaultkeystable_key(_i) \
- (DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE | \
- P80211DID_MKITEM(_i) | 0x0c000000)
-#define DIDMIB_DOT11SMT_PRIVACYTABLE \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(6))
-#define DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(6) | \
- P80211DID_MKITEM(1) | 0x18000000)
-#define DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(6) | \
- P80211DID_MKITEM(2) | 0x18000000)
-#define DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED \
- (P80211DID_MKSECTION(1) | \
- P80211DID_MKGROUP(6) | \
- P80211DID_MKITEM(4) | 0x18000000)
-#define DIDMIB_DOT11MAC_OPERATIONTABLE \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1))
-#define DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(1) | 0x18000000)
-#define DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(2) | 0x18000000)
-#define DIDMIB_DOT11MAC_OPERATIONTABLE_SHORTRETRYLIMIT \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(3) | 0x10000000)
-#define DIDMIB_DOT11MAC_OPERATIONTABLE_LONGRETRYLIMIT \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(4) | 0x10000000)
-#define DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(5) | 0x18000000)
-#define DIDMIB_DOT11MAC_OPERATIONTABLE_MAXTRANSMITMSDULIFETIME \
- (P80211DID_MKSECTION(2) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(6) | 0x10000000)
-#define DIDMIB_CAT_DOT11PHY \
- P80211DID_MKSECTION(3)
-#define DIDMIB_DOT11PHY_OPERATIONTABLE \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(1))
-#define DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(3) | \
- P80211DID_MKITEM(10) | 0x18000000)
-#define DIDMIB_DOT11PHY_DSSSTABLE \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(5))
-#define DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL \
- (P80211DID_MKSECTION(3) | \
- P80211DID_MKGROUP(5) | \
- P80211DID_MKITEM(1) | 0x10000000)
-#define DIDMIB_CAT_LNX \
- P80211DID_MKSECTION(4)
-#define DIDMIB_LNX_CONFIGTABLE \
- (P80211DID_MKSECTION(4) | \
- P80211DID_MKGROUP(1))
-#define DIDMIB_LNX_CONFIGTABLE_RSNAIE \
- (P80211DID_MKSECTION(4) | \
- P80211DID_MKGROUP(1) | \
- P80211DID_MKITEM(1) | 0x18000000)
-#define DIDMIB_CAT_P2 \
- P80211DID_MKSECTION(5)
-#define DIDMIB_P2_STATIC \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(2))
-#define DIDMIB_P2_STATIC_CNFPORTTYPE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(2) | \
- P80211DID_MKITEM(1) | 0x18000000)
-#define DIDMIB_P2_NIC_PRISUPRANGE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(5) | \
- P80211DID_MKITEM(6) | 0x10000000)
-#define DIDMIB_P2_MAC \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(6))
-#define DIDMIB_P2_MAC_CURRENTTXRATE \
- (P80211DID_MKSECTION(5) | \
- P80211DID_MKGROUP(6) | \
- P80211DID_MKITEM(12) | 0x10000000)
+#define REQ_MIBGET GROUP(1, 1)
+#define REQ_MIBGET_ATTR ITEM(REQ_MIBGET, 1)
+#define REQ_MIBGET_RESCODE ITEM(REQ_MIBGET, 2)
+
+#define REQ_MIBSET GROUP(1, 2)
+#define REQ_MIBSET_ATTR ITEM(REQ_MIBSET, 1)
+#define REQ_MIBSET_RESCODE ITEM(REQ_MIBSET, 2)
+
+#define REQ_SCAN GROUP(1, 4)
+
+#define REQ_SCAN_RESULTS GROUP(1, 5)
+
+#define REQ_START GROUP(1, 13)
+
+#define IND_AUTHENCATE GROUP(2, 1)
+
+#define IND_ASSOCIATE GROUP(2, 3)
+
+#define LNXREQ_IFSTATE GROUP(3, 1)
+
+#define LNXREQ_WLANSNIFF GROUP(3, 2)
+
+#define LNXREQ_HOSTWEP GROUP(3, 3)
+
+#define LNXREQ_COMMSQUALITY GROUP(3, 4)
+
+#define LNXREQ_AUTOJOIN GROUP(3, 5)
+
+#define P2REQ_READPDA GROUP(5, 2)
+#define P2REQ_READPDA_PDA ITEM(P2REQ_READPDA, 1)
+#define P2REQ_READPDA_RESCODE ITEM(P2REQ_READPDA, 2)
+
+#define P2REQ_RAMDL_STATE GROUP(5, 11)
+#define P2REQ_RAMDL_STATE_ENABLE ITEM(P2REQ_RAMDL_STATE, 1)
+#define P2REQ_RAMDL_STATE_EXEADDR ITEM(P2REQ_RAMDL_STATE, 2)
+#define P2REQ_RAMDL_STATE_RESCODE ITEM(P2REQ_RAMDL_STATE, 3)
+
+#define P2REQ_RAMDL_WRITE GROUP(5, 12)
+#define P2REQ_RAMDL_WRITE_ADDR ITEM(P2REQ_RAMDL_WRITE, 1)
+#define P2REQ_RAMDL_WRITE_LEN ITEM(P2REQ_RAMDL_WRITE, 2)
+#define P2REQ_RAMDL_WRITE_DATA ITEM(P2REQ_RAMDL_WRITE, 3)
+#define P2REQ_RAMDL_WRITE_RESCODE ITEM(P2REQ_RAMDL_WRITE, 4)
+
+#define P2REQ_FLASHDL_STATE GROUP(5, 13)
+#define P2REQ_FLASHDL_WRITE GROUP(5, 14)
+
+#define SMT_WEPDEFAULTKEYSTABLE GROUP(1, 4)
+#define smt_wepdefaultkeystable_key(_i) \
+ (GROUP(SMT_WEPDEFAULTKEYSTABLE, _i) | TBIT | WBIT)
+
+#define SMT_PRIVTABLE GROUP(1, 6)
+#define SMT_PRIVTABLE_PRIVACYINVOKED (ITEM(SMT_PRIVTABLE, 1) | RBIT | WBIT)
+#define SMT_PRIVTABLE_WEPDEFAULTKEYID (ITEM(SMT_PRIVTABLE, 2) | RBIT | WBIT)
+#define SMT_PRIVTABLE_EXUNENCRYPTED (ITEM(SMT_PRIVTABLE, 4) | RBIT | WBIT)
+
+#define MAC_OPTABLE GROUP(2, 1)
+#define MAC_OPTABLE_MACADDRESS (ITEM(MAC_OPTABLE, 1) | RBIT | WBIT)
+#define MAC_OPTABLE_RTSTHRESHOLD (ITEM(MAC_OPTABLE, 2) | RBIT | WBIT)
+#define MAC_OPTABLE_SHORTRETRYLIMIT (ITEM(MAC_OPTABLE, 3) | RBIT)
+#define MAC_OPTABLE_LONGRETRYLIMIT (ITEM(MAC_OPTABLE, 4) | RBIT)
+#define MAC_OPTABLE_FRAGTHRESHOLD (ITEM(MAC_OPTABLE, 5) | RBIT | WBIT)
+#define MAC_OPTABLE_MAXTXMSDULIFETIME (ITEM(MAC_OPTABLE, 6) | RBIT)
+
+#define PHY_OPTABLE GROUP(3, 1)
+#define PHY_TXPOWERTABLE_CURRTXPOWERLEVEL (ITEM(PHY_OPTABLE, 10) | RBIT | WBIT)
+
+#define PHY_DSSSTABLE GROUP(3, 5)
+#define PHY_DSSSTABLE_CURRCHAN (ITEM(PHY_DSSSTABLE, 1) | RBIT)
+
+#define LNX_CONFIGTABLE GROUP(4, 1)
+#define LNX_CONFIGTABLE_RSNAIE (ITEM(LNX_CONFIGTABLE, 1) | RBIT | WBIT)
+
+#define P2_STATIC GROUP(5, 2)
+#define P2_STATIC_CNFPORTTYPE (ITEM(P2_STATIC, 1) | RBIT | WBIT)
+
+#define P2_NIC_PRISUPRANGE (ITEM(GROUP(5, 5), 6) | RBIT)
+
+#define P2_MAC GROUP(5, 6)
+#define P2_MAC_CURRTXRATE (ITEM(P2_MAC, 12) | RBIT)
+
#endif
diff --git a/drivers/staging/wlan-ng/p80211netdev.c
b/drivers/staging/wlan-ng/p80211netdev.c
index a70fb84f38f1..827a0741b7ed 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -638,25 +638,25 @@ static int p80211knetdev_set_mac_address(struct
net_device *dev, void *addr)
/* Set up a dot11req_mibset */
memset(&dot11req, 0, sizeof(dot11req));
- dot11req.msgcode = DIDMSG_DOT11REQ_MIBSET;
+ dot11req.msgcode = REQ_MIBSET;
dot11req.msglen = sizeof(dot11req);
memcpy(dot11req.devname,
((struct wlandevice *)dev->ml_priv)->name,
WLAN_DEVNAMELEN_MAX - 1);
/* Set up the mibattribute argument */
- mibattr->did = DIDMSG_DOT11REQ_MIBSET_MIBATTRIBUTE;
+ mibattr->did = REQ_MIBSET_ATTR;
mibattr->status = P80211ENUM_msgitem_status_data_ok;
mibattr->len = sizeof(mibattr->data);
- macaddr->did = DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS;
+ macaddr->did = MAC_OPTABLE_MACADDRESS;
macaddr->status = P80211ENUM_msgitem_status_data_ok;
macaddr->len = sizeof(macaddr->data);
macaddr->data.len = ETH_ALEN;
memcpy(&macaddr->data.data, new_addr->sa_data, ETH_ALEN);
/* Set up the resultcode argument */
- resultcode->did = DIDMSG_DOT11REQ_MIBSET_RESULTCODE;
+ resultcode->did = REQ_MIBSET_RESCODE;
resultcode->status = P80211ENUM_msgitem_status_no_value;
resultcode->len = sizeof(resultcode->data);
resultcode->data = 0;
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index 9f5c1267d829..7c59ce762091 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -117,7 +117,7 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8
*msgbuf)
/* Check to make sure the MSD is running */
if (!((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
- msg->msgcode == DIDMSG_LNXREQ_IFSTATE) ||
+ msg->msgcode == LNXREQ_IFSTATE) ||
wlandev->msdstate == WLAN_MSD_RUNNING ||
wlandev->msdstate == WLAN_MSD_FWLOAD)) {
return -ENODEV;
@@ -125,7 +125,7 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8
*msgbuf)
/* Check Permissions */
if (!capable(CAP_NET_ADMIN) &&
- (msg->msgcode != DIDMSG_DOT11REQ_MIBGET)) {
+ (msg->msgcode != REQ_MIBGET)) {
netdev_err(wlandev->netdev,
"%s: only dot11req_mibget allowed for non-root.\n",
wlandev->name);
@@ -172,7 +172,7 @@ static void p80211req_handlemsg(struct wlandevice *wlandev,
struct p80211msg *msg)
{
switch (msg->msgcode) {
- case DIDMSG_LNXREQ_HOSTWEP: {
+ case LNXREQ_HOSTWEP: {
struct p80211msg_lnxreq_hostwep *req =
(struct p80211msg_lnxreq_hostwep *)msg;
wlandev->hostwep &=
@@ -184,9 +184,9 @@ static void p80211req_handlemsg(struct wlandevice *wlandev,
break;
}
- case DIDMSG_DOT11REQ_MIBGET:
- case DIDMSG_DOT11REQ_MIBSET: {
- int isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET);
+ case REQ_MIBGET:
+ case REQ_MIBSET: {
+ int isget = (msg->msgcode == REQ_MIBGET);
struct p80211msg_dot11req_mibget *mib_msg =
(struct p80211msg_dot11req_mibget *)msg;
p80211req_mibset_mibget(wlandev, mib_msg, isget);
@@ -205,17 +205,17 @@ static void p80211req_mibset_mibget(struct wlandevice
*wlandev,
u8 *key = mibitem->data + sizeof(struct p80211pstrd);
switch (mibitem->did) {
- case didmib_dot11smt_wepdefaultkeystable_key(1):
- case didmib_dot11smt_wepdefaultkeystable_key(2):
- case didmib_dot11smt_wepdefaultkeystable_key(3):
- case didmib_dot11smt_wepdefaultkeystable_key(4):
+ case smt_wepdefaultkeystable_key(1):
+ case smt_wepdefaultkeystable_key(2):
+ case smt_wepdefaultkeystable_key(3):
+ case smt_wepdefaultkeystable_key(4):
if (!isget)
wep_change_key(wlandev,
- P80211DID_ITEM(mibitem->did) - 1,
+ ITEM(0, mibitem->did) - 1,
key, pstr->len);
break;
- case DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID: {
+ case SMT_PRIVTABLE_WEPDEFAULTKEYID: {
u32 *data = (u32 *)mibitem->data;
if (isget) {
@@ -226,14 +226,14 @@ static void p80211req_mibset_mibget(struct wlandevice
*wlandev,
}
break;
}
- case DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED: {
+ case SMT_PRIVTABLE_PRIVACYINVOKED: {
u32 *data = (u32 *)mibitem->data;
p80211req_handle_action(wlandev, data, isget,
HOSTWEP_PRIVACYINVOKED);
break;
}
- case DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED: {
+ case SMT_PRIVTABLE_EXCLUDEUNENCRYPTED: {
u32 *data = (u32 *)mibitem->data;
p80211req_handle_action(wlandev, data, isget,
diff --git a/drivers/staging/wlan-ng/p80211types.h
b/drivers/staging/wlan-ng/p80211types.h
index ac254542fde6..4e42835e0692 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -133,6 +133,13 @@
* . - Unused
*/
+#define GROUP(s, g) ((s) | ((g)<<6))
+#define ITEM(g, i) (g | ((i)<<12))
+
+#define TBIT 0x4000000
+#define WBIT 0x8000000
+#define RBIT 0x10000000
+
#define P80211DID_LSB_SECTION (0)
#define P80211DID_LSB_GROUP (6)
#define P80211DID_LSB_ITEM (12)
@@ -147,31 +154,6 @@
#define P80211DID_MASK_ISTABLE (0x00000001UL)
#define P80211DID_MASK_ACCESS (0x00000003UL)
-#define P80211DID_MK(a, m, l) ((((u32)(a)) & (m)) << (l))
-
-#define P80211DID_MKSECTION(a) P80211DID_MK(a, \
- P80211DID_MASK_SECTION, \
- P80211DID_LSB_SECTION)
-#define P80211DID_MKGROUP(a) P80211DID_MK(a, \
- P80211DID_MASK_GROUP, \
- P80211DID_LSB_GROUP)
-#define P80211DID_MKITEM(a) P80211DID_MK(a, \
- P80211DID_MASK_ITEM, \
- P80211DID_LSB_ITEM)
-#define P80211DID_MKINDEX(a) P80211DID_MK(a, \
- P80211DID_MASK_INDEX, \
- P80211DID_LSB_INDEX)
-#define P80211DID_MKISTABLE(a) P80211DID_MK(a, \
- P80211DID_MASK_ISTABLE, \
- P80211DID_LSB_ISTABLE)
-
-#define P80211DID_MKID(s, g, i, n, t, a) (P80211DID_MKSECTION(s) | \
- P80211DID_MKGROUP(g) | \
- P80211DID_MKITEM(i) | \
- P80211DID_MKINDEX(n) | \
- P80211DID_MKISTABLE(t) | \
- (a))
-
#define P80211DID_GET(a, m, l) ((((u32)(a)) >> (l)) & (m))
#define P80211DID_SECTION(a) P80211DID_GET(a, \
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index 94800c007162..980c26141dcf 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -294,17 +294,17 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr,
/* read the card's PRI-SUP */
memset(&getmsg, 0, sizeof(getmsg));
- getmsg.msgcode = DIDMSG_DOT11REQ_MIBGET;
+ getmsg.msgcode = REQ_MIBGET;
getmsg.msglen = sizeof(getmsg);
strcpy(getmsg.devname, wlandev->name);
- getmsg.mibattribute.did = DIDMSG_DOT11REQ_MIBGET_MIBATTRIBUTE;
+ getmsg.mibattribute.did = REQ_MIBGET_ATTR;
getmsg.mibattribute.status = P80211ENUM_msgitem_status_data_ok;
- getmsg.resultcode.did = DIDMSG_DOT11REQ_MIBGET_RESULTCODE;
+ getmsg.resultcode.did = REQ_MIBGET_RESCODE;
getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value;
item = (struct p80211itemd *)getmsg.mibattribute.data;
- item->did = DIDMIB_P2_NIC_PRISUPRANGE;
+ item->did = P2_NIC_PRISUPRANGE;
item->status = P80211ENUM_msgitem_status_no_value;
data = (u32 *)item->data;
@@ -784,13 +784,13 @@ static int read_cardpda(struct pda *pda, struct
wlandevice *wlandev)
return -ENOMEM;
/* set up the msg */
- msg->msgcode = DIDMSG_P2REQ_READPDA;
+ msg->msgcode = P2REQ_READPDA;
msg->msglen = sizeof(msg);
strcpy(msg->devname, wlandev->name);
- msg->pda.did = DIDMSG_P2REQ_READPDA_PDA;
+ msg->pda.did = P2REQ_READPDA_PDA;
msg->pda.len = HFA384x_PDA_LEN_MAX;
msg->pda.status = P80211ENUM_msgitem_status_no_value;
- msg->resultcode.did = DIDMSG_P2REQ_READPDA_RESULTCODE;
+ msg->resultcode.did = P2REQ_READPDA_RESCODE;
msg->resultcode.len = sizeof(u32);
msg->resultcode.status = P80211ENUM_msgitem_status_no_value;
@@ -1018,11 +1018,11 @@ static int writeimage(struct wlandevice *wlandev,
struct imgchunk *fchunk,
/* Initialize the messages */
strcpy(rstmsg->devname, wlandev->name);
- rstmsg->msgcode = DIDMSG_P2REQ_RAMDL_STATE;
+ rstmsg->msgcode = P2REQ_RAMDL_STATE;
rstmsg->msglen = sizeof(*rstmsg);
- rstmsg->enable.did = DIDMSG_P2REQ_RAMDL_STATE_ENABLE;
- rstmsg->exeaddr.did = DIDMSG_P2REQ_RAMDL_STATE_EXEADDR;
- rstmsg->resultcode.did = DIDMSG_P2REQ_RAMDL_STATE_RESULTCODE;
+ rstmsg->enable.did = P2REQ_RAMDL_STATE_ENABLE;
+ rstmsg->exeaddr.did = P2REQ_RAMDL_STATE_EXEADDR;
+ rstmsg->resultcode.did = P2REQ_RAMDL_STATE_RESCODE;
rstmsg->enable.status = P80211ENUM_msgitem_status_data_ok;
rstmsg->exeaddr.status = P80211ENUM_msgitem_status_data_ok;
rstmsg->resultcode.status = P80211ENUM_msgitem_status_no_value;
@@ -1031,12 +1031,12 @@ static int writeimage(struct wlandevice *wlandev,
struct imgchunk *fchunk,
rstmsg->resultcode.len = sizeof(u32);
strcpy(rwrmsg->devname, wlandev->name);
- rwrmsg->msgcode = DIDMSG_P2REQ_RAMDL_WRITE;
+ rwrmsg->msgcode = P2REQ_RAMDL_WRITE;
rwrmsg->msglen = sizeof(*rwrmsg);
- rwrmsg->addr.did = DIDMSG_P2REQ_RAMDL_WRITE_ADDR;
- rwrmsg->len.did = DIDMSG_P2REQ_RAMDL_WRITE_LEN;
- rwrmsg->data.did = DIDMSG_P2REQ_RAMDL_WRITE_DATA;
- rwrmsg->resultcode.did = DIDMSG_P2REQ_RAMDL_WRITE_RESULTCODE;
+ rwrmsg->addr.did = P2REQ_RAMDL_WRITE_ADDR;
+ rwrmsg->len.did = P2REQ_RAMDL_WRITE_LEN;
+ rwrmsg->data.did = P2REQ_RAMDL_WRITE_DATA;
+ rwrmsg->resultcode.did = P2REQ_RAMDL_WRITE_RESCODE;
rwrmsg->addr.status = P80211ENUM_msgitem_status_data_ok;
rwrmsg->len.status = P80211ENUM_msgitem_status_data_ok;
rwrmsg->data.status = P80211ENUM_msgitem_status_data_ok;
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 1eba5fa28d8f..778d7d48d16f 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -149,89 +149,89 @@ static int prism2mib_priv(struct mibrec *mib,
static struct mibrec mibtab[] = {
/* dot11smt MIB's */
- {didmib_dot11smt_wepdefaultkeystable_key(1),
+ {smt_wepdefaultkeystable_key(1),
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0,
prism2mib_wepdefaultkey},
- {didmib_dot11smt_wepdefaultkeystable_key(2),
+ {smt_wepdefaultkeystable_key(2),
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0,
prism2mib_wepdefaultkey},
- {didmib_dot11smt_wepdefaultkeystable_key(3),
+ {smt_wepdefaultkeystable_key(3),
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,
prism2mib_wepdefaultkey},
- {didmib_dot11smt_wepdefaultkeystable_key(4),
+ {smt_wepdefaultkeystable_key(4),
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,
prism2mib_wepdefaultkey},
- {DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
+ {SMT_PRIVTABLE_PRIVACYINVOKED,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_PRIVINVOKED, 0,
prism2mib_privacyinvoked},
- {DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
+ {SMT_PRIVTABLE_WEPDEFAULTKEYID,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,
prism2mib_uint32},
- {DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
+ {SMT_PRIVTABLE_EXCLUDEUNENCRYPTED,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_EXCLUDE, 0,
prism2mib_excludeunencrypted},
/* dot11mac MIB's */
- {DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS,
+ {MAC_OPTABLE_MACADDRESS,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,
prism2mib_bytearea2pstr},
- {DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD,
+ {MAC_OPTABLE_RTSTHRESHOLD,
F_STA | F_READ | F_WRITE,
HFA384x_RID_RTSTHRESH, 0, 0,
prism2mib_uint32},
- {DIDMIB_DOT11MAC_OPERATIONTABLE_SHORTRETRYLIMIT,
+ {MAC_OPTABLE_SHORTRETRYLIMIT,
F_STA | F_READ,
HFA384x_RID_SHORTRETRYLIMIT, 0, 0,
prism2mib_uint32},
- {DIDMIB_DOT11MAC_OPERATIONTABLE_LONGRETRYLIMIT,
+ {MAC_OPTABLE_LONGRETRYLIMIT,
F_STA | F_READ,
HFA384x_RID_LONGRETRYLIMIT, 0, 0,
prism2mib_uint32},
- {DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD,
+ {MAC_OPTABLE_FRAGTHRESHOLD,
F_STA | F_READ | F_WRITE,
HFA384x_RID_FRAGTHRESH, 0, 0,
prism2mib_fragmentationthreshold},
- {DIDMIB_DOT11MAC_OPERATIONTABLE_MAXTRANSMITMSDULIFETIME,
+ {MAC_OPTABLE_MAXTXMSDULIFETIME,
F_STA | F_READ,
HFA384x_RID_MAXTXLIFETIME, 0, 0,
prism2mib_uint32},
/* dot11phy MIB's */
- {DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
+ {PHY_DSSSTABLE_CURRCHAN,
F_STA | F_READ,
HFA384x_RID_CURRENTCHANNEL, 0, 0,
prism2mib_uint32},
- {DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
+ {PHY_TXPOWERTABLE_CURRTXPOWERLEVEL,
F_STA | F_READ | F_WRITE,
HFA384x_RID_TXPOWERMAX, 0, 0,
prism2mib_uint32},
/* p2Static MIB's */
- {DIDMIB_P2_STATIC_CNFPORTTYPE,
+ {P2_STATIC_CNFPORTTYPE,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFPORTTYPE, 0, 0,
prism2mib_uint32},
/* p2MAC MIB's */
- {DIDMIB_P2_MAC_CURRENTTXRATE,
+ {P2_MAC_CURRTXRATE,
F_STA | F_READ,
HFA384x_RID_CURRENTTXRATE, 0, 0,
prism2mib_uint32},
/* And finally, lnx mibs */
- {DIDMIB_LNX_CONFIGTABLE_RSNAIE,
+ {LNX_CONFIGTABLE_RSNAIE,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWPADATA, 0, 0,
prism2mib_priv},
@@ -302,7 +302,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev,
void *msgp)
** this is a "mibset" so make make sure that the MIB may be written.
*/
- isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET);
+ isget = (msg->msgcode == REQ_MIBGET);
if (isget) {
if (!(mib->flag & F_READ)) {
@@ -709,7 +709,7 @@ static int prism2mib_priv(struct mibrec *mib,
struct p80211pstrd *pstr = data;
switch (mib->did) {
- case DIDMIB_LNX_CONFIGTABLE_RSNAIE: {
+ case LNX_CONFIGTABLE_RSNAIE: {
struct hfa384x_wpa_data wpa;
if (isget) {
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index fb5441399131..be7c45b9aea3 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -288,55 +288,55 @@ static int prism2sta_mlmerequest(struct wlandevice
*wlandev,
int result = 0;
switch (msg->msgcode) {
- case DIDMSG_DOT11REQ_MIBGET:
+ case REQ_MIBGET:
pr_debug("Received mibget request\n");
result = prism2mgmt_mibset_mibget(wlandev, msg);
break;
- case DIDMSG_DOT11REQ_MIBSET:
+ case REQ_MIBSET:
pr_debug("Received mibset request\n");
result = prism2mgmt_mibset_mibget(wlandev, msg);
break;
- case DIDMSG_DOT11REQ_SCAN:
+ case REQ_SCAN:
pr_debug("Received scan request\n");
result = prism2mgmt_scan(wlandev, msg);
break;
- case DIDMSG_DOT11REQ_SCAN_RESULTS:
+ case REQ_SCAN_RESULTS:
pr_debug("Received scan_results request\n");
result = prism2mgmt_scan_results(wlandev, msg);
break;
- case DIDMSG_DOT11REQ_START:
+ case REQ_START:
pr_debug("Received mlme start request\n");
result = prism2mgmt_start(wlandev, msg);
break;
/*
* Prism2 specific messages
*/
- case DIDMSG_P2REQ_READPDA:
+ case P2REQ_READPDA:
pr_debug("Received mlme readpda request\n");
result = prism2mgmt_readpda(wlandev, msg);
break;
- case DIDMSG_P2REQ_RAMDL_STATE:
+ case P2REQ_RAMDL_STATE:
pr_debug("Received mlme ramdl_state request\n");
result = prism2mgmt_ramdl_state(wlandev, msg);
break;
- case DIDMSG_P2REQ_RAMDL_WRITE:
+ case P2REQ_RAMDL_WRITE:
pr_debug("Received mlme ramdl_write request\n");
result = prism2mgmt_ramdl_write(wlandev, msg);
break;
- case DIDMSG_P2REQ_FLASHDL_STATE:
+ case P2REQ_FLASHDL_STATE:
pr_debug("Received mlme flashdl_state request\n");
result = prism2mgmt_flashdl_state(wlandev, msg);
break;
- case DIDMSG_P2REQ_FLASHDL_WRITE:
+ case P2REQ_FLASHDL_WRITE:
pr_debug("Received mlme flashdl_write request\n");
result = prism2mgmt_flashdl_write(wlandev, msg);
break;
/*
* Linux specific messages
*/
- case DIDMSG_LNXREQ_HOSTWEP:
+ case LNXREQ_HOSTWEP:
break; /* ignore me. */
- case DIDMSG_LNXREQ_IFSTATE: {
+ case LNXREQ_IFSTATE: {
struct p80211msg_lnxreq_ifstate *ifstatemsg;
pr_debug("Received mlme ifstate request\n");
@@ -349,15 +349,15 @@ static int prism2sta_mlmerequest(struct wlandevice
*wlandev,
result = 0;
break;
}
- case DIDMSG_LNXREQ_WLANSNIFF:
+ case LNXREQ_WLANSNIFF:
pr_debug("Received mlme wlansniff request\n");
result = prism2mgmt_wlansniff(wlandev, msg);
break;
- case DIDMSG_LNXREQ_AUTOJOIN:
+ case LNXREQ_AUTOJOIN:
pr_debug("Received mlme autojoin request\n");
result = prism2mgmt_autojoin(wlandev, msg);
break;
- case DIDMSG_LNXREQ_COMMSQUALITY: {
+ case LNXREQ_COMMSQUALITY: {
struct p80211msg_lnxreq_commsquality *qualmsg;
pr_debug("Received commsquality request\n");
@@ -1943,8 +1943,8 @@ void prism2sta_commsqual_defer(struct work_struct *data)
}
/* Get the signal rate */
- msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
- mibitem->did = DIDMIB_P2_MAC_CURRENTTXRATE;
+ msg.msgcode = REQ_MIBGET;
+ mibitem->did = P2_MAC_CURRTXRATE;
result = p80211req_dorequest(wlandev, (u8 *)&msg);
if (result) {
--
2.11.0
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
