]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] ipw2100: Fix `iwpriv set_power` error
authorZhu Yi <yi.zhu@intel.com>
Thu, 12 Jul 2007 08:09:24 +0000 (16:09 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Jul 2007 01:56:17 +0000 (21:56 -0400)
iwpriv <iface> set_power [0~6] can be used for ipw2100. '0' indicates
off and '6' indicates auto. 1~5 are the actual power levels.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ipw2100.c

index 072ede71e575a0fcfc224c4da1da53794c0f8ea4..8990585bd2285503faa941fccf5b5e408a36488b 100644 (file)
@@ -7868,10 +7868,10 @@ static int ipw2100_wx_set_powermode(struct net_device *dev,
                goto done;
        }
 
-       if ((mode < 1) || (mode > POWER_MODES))
+       if ((mode < 0) || (mode > POWER_MODES))
                mode = IPW_POWER_AUTO;
 
-       if (priv->power_mode != mode)
+       if (IPW_POWER_LEVEL(priv->power_mode) != mode)
                err = ipw2100_set_power_mode(priv, mode);
       done:
        mutex_unlock(&priv->action_mutex);
@@ -7902,7 +7902,7 @@ static int ipw2100_wx_get_powermode(struct net_device *dev,
                        break;
                case IPW_POWER_AUTO:
                        snprintf(extra, MAX_POWER_STRING,
-                                "Power save level: %d (Auto)", 0);
+                                "Power save level: %d (Auto)", level);
                        break;
                default:
                        timeout = timeout_duration[level - 1] / 1000;