Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / net / wireless / core.c

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 0283517..20db902 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -14,6 +14,7 @@
 #include <linux/device.h>
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
+#include <linux/sched.h>
 #include <net/genetlink.h>
 #include <net/cfg80211.h>
 #include "nl80211.h"
@@ -44,6 +45,9 @@ DEFINE_MUTEX(cfg80211_mutex);
 /* for debugfs */
 static struct dentry *ieee80211_debugfs_dir;
 
+/* for the cleanup, scan and event works */
+struct workqueue_struct *cfg80211_wq;
+
 /* requires cfg80211_mutex to be held! */
 struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx)
 {
@@ -230,7 +234,7 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
        struct wireless_dev *wdev;
        int err = 0;
 
-       if (!rdev->wiphy.netnsok)
+       if (!(rdev->wiphy.flags & WIPHY_FLAG_NETNS_OK))
                return -EOPNOTSUPP;
 
        list_for_each_entry(wdev, &rdev->netdev_list, list) {
@@ -367,7 +371,9 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
        rdev->wiphy.dev.class = &ieee80211_class;
        rdev->wiphy.dev.platform_data = rdev;
 
-       rdev->wiphy.ps_default = CONFIG_CFG80211_DEFAULT_PS_VALUE;
+#ifdef CONFIG_CFG80211_DEFAULT_PS
+       rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
+#endif
 
        wiphy_net_set(&rdev->wiphy, &init_net);
 
@@ -396,6 +402,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
        rdev->wiphy.retry_long = 4;
        rdev->wiphy.frag_threshold = (u32) -1;
        rdev->wiphy.rts_threshold = (u32) -1;
+       rdev->wiphy.coverage_class = 0;
 
        return &rdev->wiphy;
 }
@@ -482,7 +489,7 @@ int wiphy_register(struct wiphy *wiphy)
        if (IS_ERR(rdev->wiphy.debugfsdir))
                rdev->wiphy.debugfsdir = NULL;
 
-       if (wiphy->custom_regulatory) {
+       if (wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
                struct regulatory_request request;
 
                request.wiphy_idx = get_wiphy_idx(wiphy);
@@ -680,7 +687,10 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                wdev->wext.default_key = -1;
                wdev->wext.default_mgmt_key = -1;
                wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;
-               wdev->wext.ps = wdev->wiphy->ps_default;
+               if (wdev->wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT)
+                       wdev->wext.ps = true;
+               else
+                       wdev->wext.ps = false;
                wdev->wext.ps_timeout = 100;
                if (rdev->ops->set_power_mgmt)
                        if (rdev->ops->set_power_mgmt(wdev->wiphy, dev,
@@ -692,6 +702,10 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
 #endif
                if (!dev->ethtool_ops)
                        dev->ethtool_ops = &cfg80211_ethtool_ops;
+
+               if ((wdev->iftype == NL80211_IFTYPE_STATION ||
+                    wdev->iftype == NL80211_IFTYPE_ADHOC) && !wdev->use_4addr)
+                       dev->priv_flags |= IFF_DONT_BRIDGE;
                break;
        case NETDEV_GOING_DOWN:
                switch (wdev->iftype) {
@@ -717,7 +731,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                break;
        case NETDEV_DOWN:
                dev_hold(dev);
-               schedule_work(&wdev->cleanup_work);
+               queue_work(cfg80211_wq, &wdev->cleanup_work);
                break;
        case NETDEV_UP:
                /*
@@ -732,9 +746,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                        mutex_unlock(&rdev->devlist_mtx);
                        dev_put(dev);
                }
-#ifdef CONFIG_CFG80211_WEXT
                cfg80211_lock_rdev(rdev);
                mutex_lock(&rdev->devlist_mtx);
+#ifdef CONFIG_CFG80211_WEXT
                wdev_lock(wdev);
                switch (wdev->iftype) {
                case NL80211_IFTYPE_ADHOC:
@@ -747,10 +761,10 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
                        break;
                }
                wdev_unlock(wdev);
+#endif
                rdev->opencount++;
                mutex_unlock(&rdev->devlist_mtx);
                cfg80211_unlock_rdev(rdev);
-#endif
                break;
        case NETDEV_UNREGISTER:
                /*
@@ -835,8 +849,14 @@ static int __init cfg80211_init(void)
        if (err)
                goto out_fail_reg;
 
+       cfg80211_wq = create_singlethread_workqueue("cfg80211");
+       if (!cfg80211_wq)
+               goto out_fail_wq;
+
        return 0;
 
+out_fail_wq:
+       regulatory_exit();
 out_fail_reg:
        debugfs_remove(ieee80211_debugfs_dir);
 out_fail_nl80211:
@@ -858,5 +878,6 @@ static void cfg80211_exit(void)
        wiphy_sysfs_exit();
        regulatory_exit();
        unregister_pernet_device(&cfg80211_pernet_ops);
+       destroy_workqueue(cfg80211_wq);
 }
 module_exit(cfg80211_exit);