libertas: remove some references to IW_MODE_abc

... in pursue to quaff the wide-spread references to WEXT constants.

When setting SNMP_MIB_OID_BSS_TYPE, wext.c can directly calculate the value
the firmware wants.

Reading of SNMP_MIB_OID_BSS_TYPE doesn't happen anywhere, so no need to
convert the firmware value into WEXT values anyway.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 4ce554ac900fb42479549637a9561f517fcad35f..751067369ba84ec8506bbe7b087f3691ab3fd0cc 100644 (file)
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -1567,7 +1567,8 @@ static int assoc_helper_mode(struct lbs_private *priv,
        }
 
        priv->mode = assoc_req->mode;
-       ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE, assoc_req->mode);
+       ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE,
+               assoc_req->mode == IW_MODE_ADHOC ? 2 : 1);
 
 done:
        lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 65fd50d31764d8aab395d42e4602865af9216ac7..1065ce29cd080783daf7a1a79ff3c8e560acdefb 100644 (file)
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -390,7 +390,7 @@ int lbs_set_snmp_mib(struct lbs_private *priv, u32 oid, u16 val)
        switch (oid) {
        case SNMP_MIB_OID_BSS_TYPE:
                cmd.bufsize = cpu_to_le16(sizeof(u8));
-               cmd.value[0] = (val == IW_MODE_ADHOC) ? 2 : 1;
+               cmd.value[0] = val;
                break;
        case SNMP_MIB_OID_11D_ENABLE:
        case SNMP_MIB_OID_FRAG_THRESHOLD:
@@ -443,13 +443,7 @@ int lbs_get_snmp_mib(struct lbs_private *priv, u32 oid, u16 *out_val)
 
        switch (le16_to_cpu(cmd.bufsize)) {
        case sizeof(u8):
-               if (oid == SNMP_MIB_OID_BSS_TYPE) {
-                       if (cmd.value[0] == 2)
-                               *out_val = IW_MODE_ADHOC;
-                       else
-                               *out_val = IW_MODE_INFRA;
-               } else
-                       *out_val = cmd.value[0];
+               *out_val = cmd.value[0];
                break;
        case sizeof(u16):
                *out_val = le16_to_cpu(*((__le16 *)(&cmd.value)));