Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (166 commits)
  Revert "ax25: zero length frame filtering in AX25"
  Revert "netrom: zero length frame filtering in NetRom"
  cfg80211: default CONFIG_WIRELESS_OLD_REGULATORY to n
  mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi
  mac80211: fix aggregation to not require queue stop
  mac80211: add skb length sanity checking
  mac80211: unify and fix TX aggregation start
  mac80211: clean up __ieee80211_tx args
  mac80211: rework the pending packets code
  mac80211: fix A-MPDU queue assignment
  mac80211: rewrite fragmentation
  iwlwifi: show current driver status in user readable format
  b43: Add BCM4307 PCI-ID
  cfg80211: fix locking in nl80211_set_wiphy
  mac80211: fix RX path
  ath5k: properly drop packets from ops->tx
  ar9170: single module build
  ath9k: fix dma mapping leak of rx buffer upon rmmod
  rt2x00: New USB ID for rt73usb
  ath5k: warn and correct rate for unknown hw rate indexes
  ...

1 files changed, 10 insertions, 20 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 17fe39049740..d1f556535f6d 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -87,7 +87,7 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
 }
 
 /* requires cfg80211_mutex to be held! */
-static struct cfg80211_registered_device *
+struct cfg80211_registered_device *
 __cfg80211_drv_from_info(struct genl_info *info)
 {
         int ifindex;
@@ -176,13 +176,14 @@ void cfg80211_put_dev(struct cfg80211_registered_device *drv)
         mutex_unlock(&drv->mtx);
 }
 
+/* requires cfg80211_mutex to be held */
 int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                         char *newname)
 {
         struct cfg80211_registered_device *drv;
         int wiphy_idx, taken = -1, result, digits;
 
-        mutex_lock(&cfg80211_mutex);
+        assert_cfg80211_lock();
 
         /* prohibit calling the thing phy%d when %d is not its number */
         sscanf(newname, PHY_NAME "%d%n", &wiphy_idx, &taken);
@@ -195,30 +196,23 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                  * deny the name if it is phy<idx> where <idx> is printed
                  * without leading zeroes. taken == strlen(newname) here
                  */
-                result = -EINVAL;
                 if (taken == strlen(PHY_NAME) + digits)
-                        goto out_unlock;
+                        return -EINVAL;
         }
 
 
         /* Ignore nop renames */
-        result = 0;
         if (strcmp(newname, dev_name(&rdev->wiphy.dev)) == 0)
-                goto out_unlock;
+                return 0;
 
         /* Ensure another device does not already have this name. */
-        list_for_each_entry(drv, &cfg80211_drv_list, list) {
-                result = -EINVAL;
+        list_for_each_entry(drv, &cfg80211_drv_list, list)
                 if (strcmp(newname, dev_name(&drv->wiphy.dev)) == 0)
-                        goto out_unlock;
-        }
+                        return -EINVAL;
 
-        /* this will only check for collisions in sysfs
-         * which is not even always compiled in.
-         */
         result = device_rename(&rdev->wiphy.dev, newname);
         if (result)
-                goto out_unlock;
+                return result;
 
         if (rdev->wiphy.debugfsdir &&
             !debugfs_rename(rdev->wiphy.debugfsdir->d_parent,
@@ -228,13 +222,9 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                 printk(KERN_ERR "cfg80211: failed to rename debugfs dir to %s!\n",
                        newname);
 
-        result = 0;
-out_unlock:
-        mutex_unlock(&cfg80211_mutex);
-        if (result == 0)
-                nl80211_notify_dev_rename(rdev);
+        nl80211_notify_dev_rename(rdev);
 
-        return result;
+        return 0;
 }
 
 /* exported functions */