Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

9 files changed, 89 insertions, 105 deletions

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 9cbf545e95a2..ba2643a43c73 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,16 +1,19 @@
 config MAC80211
         tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
+        depends on CFG80211
         select CRYPTO
         select CRYPTO_ECB
         select CRYPTO_ARC4
         select CRYPTO_AES
         select CRC32
         select WIRELESS_EXT
-        select CFG80211
         ---help---
           This option enables the hardware independent IEEE 802.11
           networking stack.
 
+comment "CFG80211 needs to be enabled for MAC80211"
+        depends on CFG80211=n
+
 config MAC80211_DEFAULT_PS
         bool "enable powersave by default"
         depends on MAC80211
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 77e9ff5ec4f3..a9211cc183cb 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -664,18 +664,19 @@ static void sta_apply_parameters(struct ieee80211_local *local,
         spin_unlock_bh(&sta->lock);
 
         /*
+         * cfg80211 validates this (1-2007) and allows setting the AID
+         * only when creating a new station entry
+         */
+        if (params->aid)
+                sta->sta.aid = params->aid;
+
+        /*
          * FIXME: updating the following information is racy when this
          *        function is called from ieee80211_change_station().
          *        However, all this information should be static so
          *        maybe we should just reject attemps to change it.
          */
 
-        if (params->aid) {
-                sta->sta.aid = params->aid;
-                if (sta->sta.aid > IEEE80211_MAX_AID)
-                        sta->sta.aid = 0; /* XXX: should this be an error? */
-        }
-
         if (params->listen_interval >= 0)
                 sta->listen_interval = params->listen_interval;
 
@@ -1255,7 +1256,7 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
                 sdata->u.mgd.flags |= IEEE80211_STA_AUTO_SSID_SEL;
 
         ret = ieee80211_sta_set_extra_ie(sdata, req->ie, req->ie_len);
-        if (ret)
+        if (ret && ret != -EALREADY)
                 return ret;
 
         if (req->use_mfp) {
@@ -1333,6 +1334,53 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
         return 0;
 }
 
+static int ieee80211_set_tx_power(struct wiphy *wiphy,
+                                  enum tx_power_setting type, int dbm)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+        struct ieee80211_channel *chan = local->hw.conf.channel;
+        u32 changes = 0;
+
+        switch (type) {
+        case TX_POWER_AUTOMATIC:
+                local->user_power_level = -1;
+                break;
+        case TX_POWER_LIMITED:
+                if (dbm < 0)
+                        return -EINVAL;
+                local->user_power_level = dbm;
+                break;
+        case TX_POWER_FIXED:
+                if (dbm < 0)
+                        return -EINVAL;
+                /* TODO: move to cfg80211 when it knows the channel */
+                if (dbm > chan->max_power)
+                        return -EINVAL;
+                local->user_power_level = dbm;
+                break;
+        }
+
+        ieee80211_hw_config(local, changes);
+
+        return 0;
+}
+
+static int ieee80211_get_tx_power(struct wiphy *wiphy, int *dbm)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+
+        *dbm = local->hw.conf.power_level;
+
+        return 0;
+}
+
+static void ieee80211_rfkill_poll(struct wiphy *wiphy)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+
+        drv_rfkill_poll(local);
+}
+
 struct cfg80211_ops mac80211_config_ops = {
         .add_virtual_intf = ieee80211_add_iface,
         .del_virtual_intf = ieee80211_del_iface,
@@ -1372,4 +1420,7 @@ struct cfg80211_ops mac80211_config_ops = {
         .join_ibss = ieee80211_join_ibss,
         .leave_ibss = ieee80211_leave_ibss,
         .set_wiphy_params = ieee80211_set_wiphy_params,
+        .set_tx_power = ieee80211_set_tx_power,
+        .get_tx_power = ieee80211_get_tx_power,
+        .rfkill_poll = ieee80211_rfkill_poll,
 };
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 3912b5334b9c..b13446afd48f 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -181,4 +181,11 @@ static inline int drv_ampdu_action(struct ieee80211_local *local,
                                                 sta, tid, ssn);
         return -EOPNOTSUPP;
 }
+
+
+static inline void drv_rfkill_poll(struct ieee80211_local *local)
+{
+        if (local->ops->rfkill_poll)
+                local->ops->rfkill_poll(&local->hw);
+}
 #endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8c9f1c722cdb..b7c8a4484298 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -170,7 +170,7 @@ static int ieee80211_open(struct net_device *dev)
                         goto err_del_bss;
                 /* we're brought up, everything changes */
                 hw_reconf_flags = ~0;
-                ieee80211_led_radio(local, local->hw.conf.radio_enabled);
+                ieee80211_led_radio(local, true);
         }
 
         /*
@@ -560,7 +560,7 @@ static int ieee80211_stop(struct net_device *dev)
 
                 drv_stop(local);
 
-                ieee80211_led_radio(local, 0);
+                ieee80211_led_radio(local, false);
 
                 flush_workqueue(local->hw.workqueue);
 
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e37770ced53c..2683df918073 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -289,16 +289,8 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
         drv_bss_info_changed(local, &sdata->vif,
                              &sdata->vif.bss_conf, changed);
 
-        /*
-         * DEPRECATED
-         *
-         * ~changed is just there to not do this at resume time
-         */
-        if (changed & BSS_CHANGED_BEACON_INT && ~changed) {
-                local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;
-                ieee80211_hw_config(local,
-                                    _IEEE80211_CONF_CHANGE_BEACON_INTERVAL);
-        }
+        /* DEPRECATED */
+        local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;
 }
 
 u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata)
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index d5611d8fd0d6..a360bceeba59 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -44,6 +44,15 @@
  * When the insertion fails (sta_info_insert()) returns non-zero), the
  * structure will have been freed by sta_info_insert()!
  *
+ * sta entries are added by mac80211 when you establish a link with a
+ * peer. This means different things for the different type of interfaces
+ * we support. For a regular station this mean we add the AP sta when we
+ * receive an assocation response from the AP. For IBSS this occurs when
+ * we receive a probe response or a beacon from target IBSS network. For
+ * WDS we add the sta for the peer imediately upon device open. When using
+ * AP mode we add stations for each respective station upon request from
+ * userspace through nl80211.
+ *
  * Because there are debugfs entries for each station, and adding those
  * must be able to sleep, it is also possible to "pin" a station entry,
  * that means it can be removed from the hash table but not be freed.
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index a910148b8228..1436f747531a 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1238,7 +1238,6 @@ static void ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
                          bool txpending)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct sta_info *sta;
         struct ieee80211_tx_data tx;
         ieee80211_tx_result res_prepare;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
@@ -1270,7 +1269,6 @@ static void ieee80211_tx(struct net_device *dev, struct sk_buff *skb,
                 return;
         }
 
-        sta = tx.sta;
         tx.channel = local->hw.conf.channel;
         info->band = tx.channel->band;
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 949d857debd8..22f63815fb36 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -657,15 +657,15 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
 
                 switch (queue) {
                 case 3: /* AC_BK */
-                        qparam.cw_max = aCWmin;
-                        qparam.cw_min = aCWmax;
+                        qparam.cw_max = aCWmax;
+                        qparam.cw_min = aCWmin;
                         qparam.txop = 0;
                         qparam.aifs = 7;
                         break;
                 default: /* never happens but let's not leave undefined */
                 case 2: /* AC_BE */
-                        qparam.cw_max = aCWmin;
-                        qparam.cw_min = aCWmax;
+                        qparam.cw_max = aCWmax;
+                        qparam.cw_min = aCWmin;
                         qparam.txop = 0;
                         qparam.aifs = 3;
                         break;
@@ -973,7 +973,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         if (local->open_count) {
                 res = drv_start(local);
 
-                ieee80211_led_radio(local, hw->conf.radio_enabled);
+                ieee80211_led_radio(local, true);
         }
 
         /* add interfaces */
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index a01154e127f0..d2d81b103341 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -306,82 +306,6 @@ static int ieee80211_ioctl_giwrate(struct net_device *dev,
         return 0;
 }
 
-static int ieee80211_ioctl_siwtxpower(struct net_device *dev,
-                                      struct iw_request_info *info,
-                                      union iwreq_data *data, char *extra)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_channel* chan = local->hw.conf.channel;
-        bool reconf = false;
-        u32 reconf_flags = 0;
-        int new_power_level;
-
-        if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM)
-                return -EINVAL;
-        if (data->txpower.flags & IW_TXPOW_RANGE)
-                return -EINVAL;
-        if (!chan)
-                return -EINVAL;
-
-        /* only change when not disabling */
-        if (!data->txpower.disabled) {
-                if (data->txpower.fixed) {
-                        if (data->txpower.value < 0)
-                                return -EINVAL;
-                        new_power_level = data->txpower.value;
-                        /*
-                         * Debatable, but we cannot do a fixed power
-                         * level above the regulatory constraint.
-                         * Use "iwconfig wlan0 txpower 15dBm" instead.
-                         */
-                        if (new_power_level > chan->max_power)
-                                return -EINVAL;
-                } else {
-                        /*
-                         * Automatic power level setting, max being the value
-                         * passed in from userland.
-                         */
-                        if (data->txpower.value < 0)
-                                new_power_level = -1;
-                        else
-                                new_power_level = data->txpower.value;
-                }
-
-                reconf = true;
-
-                /*
-                 * ieee80211_hw_config() will limit to the channel's
-                 * max power and possibly power constraint from AP.
-                 */
-                local->user_power_level = new_power_level;
-        }
-
-        if (local->hw.conf.radio_enabled != !(data->txpower.disabled)) {
-                local->hw.conf.radio_enabled = !(data->txpower.disabled);
-                reconf_flags |= IEEE80211_CONF_CHANGE_RADIO_ENABLED;
-                ieee80211_led_radio(local, local->hw.conf.radio_enabled);
-        }
-
-        if (reconf || reconf_flags)
-                ieee80211_hw_config(local, reconf_flags);
-
-        return 0;
-}
-
-static int ieee80211_ioctl_giwtxpower(struct net_device *dev,
-                                   struct iw_request_info *info,
-                                   union iwreq_data *data, char *extra)
-{
-        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-
-        data->txpower.fixed = 1;
-        data->txpower.disabled = !(local->hw.conf.radio_enabled);
-        data->txpower.value = local->hw.conf.power_level;
-        data->txpower.flags = IW_TXPOW_DBM;
-
-        return 0;
-}
-
 static int ieee80211_ioctl_siwpower(struct net_device *dev,
                                     struct iw_request_info *info,
                                     struct iw_param *wrq,
@@ -658,8 +582,8 @@ static const iw_handler ieee80211_handler[] =
         (iw_handler) cfg80211_wext_giwrts,              /* SIOCGIWRTS */
         (iw_handler) cfg80211_wext_siwfrag,             /* SIOCSIWFRAG */
         (iw_handler) cfg80211_wext_giwfrag,             /* SIOCGIWFRAG */
-        (iw_handler) ieee80211_ioctl_siwtxpower,        /* SIOCSIWTXPOW */
-        (iw_handler) ieee80211_ioctl_giwtxpower,        /* SIOCGIWTXPOW */
+        (iw_handler) cfg80211_wext_siwtxpower,          /* SIOCSIWTXPOW */
+        (iw_handler) cfg80211_wext_giwtxpower,          /* SIOCGIWTXPOW */
         (iw_handler) cfg80211_wext_siwretry,            /* SIOCSIWRETRY */
         (iw_handler) cfg80211_wext_giwretry,            /* SIOCGIWRETRY */
         (iw_handler) cfg80211_wext_siwencode,           /* SIOCSIWENCODE */