Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined drivers/net/wireless/airo.c
index 924ed095dd997116d8e334c7e7f81288eec34aeb,fdebbe7eebb66421e24f62414b125d180dc5332f..5a56502c4eb0c982df11ca607640e3ca83518d4d
--- 1/drivers/net/wireless/airo.c
--- 2/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@@ -217,7 -217,6 +217,6 @@@ static const char *statsLabels[] = 
     (no spaces) list of rates (up to 8). */
  
  static int rates[8];
- static int basic_rate;
  static char *ssids[3];
  
  static int io[4];
@@@ -250,7 -249,6 +249,6 @@@ MODULE_LICENSE("Dual BSD/GPL")
  MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350");
  module_param_array(io, int, NULL, 0);
  module_param_array(irq, int, NULL, 0);
- module_param(basic_rate, int, 0);
  module_param_array(rates, int, NULL, 0);
  module_param_array(ssids, charp, NULL, 0);
  module_param(auto_wep, int, 0);
@@@ -2723,8 -2721,9 +2721,8 @@@ static int airo_networks_allocate(struc
        if (ai->networks)
                return 0;
  
 -      ai->networks =
 -          kzalloc(AIRO_MAX_NETWORK_COUNT * sizeof(BSSListElement),
 -                  GFP_KERNEL);
 +      ai->networks = kcalloc(AIRO_MAX_NETWORK_COUNT, sizeof(BSSListElement),
 +                             GFP_KERNEL);
        if (!ai->networks) {
                airo_print_warn("", "Out of memory allocating beacons");
                return -ENOMEM;
@@@ -3883,15 -3882,6 +3881,6 @@@ static u16 setup_card(struct airo_info 
                                ai->config.rates[i] = rates[i];
                        }
                }
-               if ( basic_rate > 0 ) {
-                       for( i = 0; i < 8; i++ ) {
-                               if ( ai->config.rates[i] == basic_rate ||
-                                    !ai->config.rates ) {
-                                       ai->config.rates[i] = basic_rate | 0x80;
-                                       break;
-                               }
-                       }
-               }
                set_bit (FLAG_COMMIT, &ai->flags);
        }
  

diff --combined net/mac80211/main.c
index fda97bb0018b3de97ace2d27ecf8c5d9e3124d11,e24fa5be426425fa07f731e8f5df0de25beca50b..db341a99c7c7d995ac66964e721df5b984973c1f
--- 1/net/mac80211/main.c
--- 2/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@@ -110,7 -110,8 +110,8 @@@ int ieee80211_hw_config(struct ieee8021
                chan = scan_chan;
                channel_type = NL80211_CHAN_NO_HT;
                local->hw.conf.flags |= IEEE80211_CONF_OFFCHANNEL;
-       } else if (local->tmp_channel) {
+       } else if (local->tmp_channel &&
+                  local->oper_channel != local->tmp_channel) {
                chan = scan_chan = local->tmp_channel;
                channel_type = local->tmp_channel_type;
                local->hw.conf.flags |= IEEE80211_CONF_OFFCHANNEL;
@@@ -365,7 -366,7 +366,7 @@@ static int ieee80211_ifa_changed(struc
        if (sdata->vif.type != NL80211_IFTYPE_STATION)
                return NOTIFY_DONE;
  
 -      idev = sdata->dev->ip_ptr;
 +      idev = __in_dev_get_rtnl(sdata->dev);
        if (!idev)
                return NOTIFY_DONE;