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

3 files changed, 14 insertions, 2 deletions

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index bb6c0feb2d48..476c8486f789 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -112,7 +112,7 @@ DEBUGFS_READONLY_FILE(wep_iv, 20, "%#06x",
                       local->wep_iv & 0xffffff);
 DEBUGFS_READONLY_FILE(tx_power_reduction, 20, "%d.%d dBm",
                       local->hw.conf.tx_power_reduction / 10,
-                      local->hw.conf.tx_power_reduction & 10);
+                      local->hw.conf.tx_power_reduction % 10);
 DEBUGFS_READONLY_FILE(rate_ctrl_alg, 100, "%s",
                       local->rate_ctrl ? local->rate_ctrl->ops->name : "<unset>");
 
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 9f30ae4c2ab3..91b545c144c1 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2592,11 +2592,17 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
 
         read_lock(&local->sub_if_lock);
         list_for_each_entry(sdata, &local->sub_if_list, list) {
+
+                /* No need to wake the master device. */
+                if (sdata->dev == local->mdev)
+                        continue;
+
                 if (sdata->type == IEEE80211_IF_TYPE_STA) {
                         if (sdata->u.sta.associated)
                                 ieee80211_send_nullfunc(local, sdata, 0);
                         ieee80211_sta_timer((unsigned long)sdata);
                 }
+
                 netif_wake_queue(sdata->dev);
         }
         read_unlock(&local->sub_if_lock);
@@ -2738,6 +2744,12 @@ static int ieee80211_sta_start_scan(struct net_device *dev,
 
         read_lock(&local->sub_if_lock);
         list_for_each_entry(sdata, &local->sub_if_list, list) {
+
+                /* Don't stop the master interface, otherwise we can't transmit
+                 * probes! */
+                if (sdata->dev == local->mdev)
+                        continue;
+
                 netif_stop_queue(sdata->dev);
                 if (sdata->type == IEEE80211_IF_TYPE_STA &&
                     sdata->u.sta.associated)
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 3ebae1442963..88aaacd9f822 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -33,7 +33,7 @@ static ssize_t _show_permaddr(struct device *dev,
                               struct device_attribute *attr,
                               char *buf)
 {
-        char *addr = dev_to_rdev(dev)->wiphy.perm_addr;
+        unsigned char *addr = dev_to_rdev(dev)->wiphy.perm_addr;
 
         return sprintf(buf, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);