Merge branch 'linux-2.6.33.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax

3 files changed, 22 insertions, 1 deletions

diff --git a/net/wimax/op-msg.c b/net/wimax/op-msg.c
index d631a17186bc..d3bfb6ef13ae 100644
--- a/net/wimax/op-msg.c
+++ b/net/wimax/op-msg.c
@@ -388,6 +388,8 @@ int wimax_gnl_doit_msg_from_user(struct sk_buff *skb, struct genl_info *info)
         }
         mutex_lock(&wimax_dev->mutex);
         result = wimax_dev_is_ready(wimax_dev);
+        if (result == -ENOMEDIUM)
+                result = 0;
         if (result < 0)
                 goto error_not_ready;
         result = -ENOSYS;
diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c
index 70ef4df863b9..94d339c345d2 100644
--- a/net/wimax/op-rfkill.c
+++ b/net/wimax/op-rfkill.c
@@ -305,8 +305,15 @@ int wimax_rfkill(struct wimax_dev *wimax_dev, enum wimax_rf_state state)
         d_fnstart(3, dev, "(wimax_dev %p state %u)\n", wimax_dev, state);
         mutex_lock(&wimax_dev->mutex);
         result = wimax_dev_is_ready(wimax_dev);
-        if (result < 0)
+        if (result < 0) {
+                /* While initializing, < 1.4.3 wimax-tools versions use
+                 * this call to check if the device is a valid WiMAX
+                 * device; so we allow it to proceed always,
+                 * considering the radios are all off. */
+                if (result == -ENOMEDIUM && state == WIMAX_RF_QUERY)
+                        result = WIMAX_RF_OFF << 1 | WIMAX_RF_OFF;
                 goto error_not_ready;
+        }
         switch (state) {
         case WIMAX_RF_ON:
         case WIMAX_RF_OFF:
@@ -355,6 +362,7 @@ int wimax_rfkill_add(struct wimax_dev *wimax_dev)
 
         wimax_dev->rfkill = rfkill;
 
+        rfkill_init_sw_state(rfkill, 1);
         result = rfkill_register(wimax_dev->rfkill);
         if (result < 0)
                 goto error_rfkill_register;
diff --git a/net/wimax/stack.c b/net/wimax/stack.c
index 79fb7d7c640f..c8866412f830 100644
--- a/net/wimax/stack.c
+++ b/net/wimax/stack.c
@@ -60,6 +60,14 @@
 #define D_SUBMODULE stack
 #include "debug-levels.h"
 
+static char wimax_debug_params[128];
+module_param_string(debug, wimax_debug_params, sizeof(wimax_debug_params),
+                    0644);
+MODULE_PARM_DESC(debug,
+                 "String of space-separated NAME:VALUE pairs, where NAMEs "
+                 "are the different debug submodules and VALUE are the "
+                 "initial debug value to set.");
+
 /*
  * Authoritative source for the RE_STATE_CHANGE attribute policy
  *
@@ -562,6 +570,9 @@ int __init wimax_subsys_init(void)
         int result, cnt;
 
         d_fnstart(4, NULL, "()\n");
+        d_parse_params(D_LEVEL, D_LEVEL_SIZE, wimax_debug_params,
+                       "wimax.debug");
+
         snprintf(wimax_gnl_family.name, sizeof(wimax_gnl_family.name),
                  "WiMAX");
         result = genl_register_family(&wimax_gnl_family);