5 files changed, 6 insertions, 17 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 33b75b9b8efa..5ffff039b017 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -875,8 +875,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                 /* allow mac80211 to determine the timeout */
                 wdev->ps_timeout = -1;
 
-                if (!dev->ethtool_ops)
-                        dev->ethtool_ops = &cfg80211_ethtool_ops;
+                netdev_set_default_ethtool_ops(dev, &cfg80211_ethtool_ops);
 
                 if ((wdev->iftype == NL80211_IFTYPE_STATION ||
                      wdev->iftype == NL80211_IFTYPE_P2P_CLIENT ||
diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
index 48c48ffafa1d..e37862f1b127 100644
--- a/net/wireless/ethtool.c
+++ b/net/wireless/ethtool.c
@@ -15,10 +15,10 @@ static void cfg80211_get_drvinfo(struct net_device *dev,
         strlcpy(info->version, init_utsname()->release, sizeof(info->version));
 
         if (wdev->wiphy->fw_version[0])
-                strncpy(info->fw_version, wdev->wiphy->fw_version,
+                strlcpy(info->fw_version, wdev->wiphy->fw_version,
                         sizeof(info->fw_version));
         else
-                strncpy(info->fw_version, "N/A", sizeof(info->fw_version));
+                strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
 
         strlcpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
                 sizeof(info->bus_info));
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 93ab840957a0..98532c00242d 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2265,7 +2265,6 @@ int set_regdom(const struct ieee80211_regdomain *rd)
         return r;
 }
 
-#ifdef CONFIG_HOTPLUG
 int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct regulatory_request *lr;
@@ -2285,12 +2284,6 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
                                       alpha2[0], alpha2[1]);
         return 0;
 }
-#else
-int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-        return -ENODEV;
-}
-#endif /* CONFIG_HOTPLUG */
 
 void wiphy_regulatory_register(struct wiphy *wiphy)
 {
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 73bf39f11314..238ee49b3868 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -77,13 +77,11 @@ static void wiphy_dev_release(struct device *dev)
         cfg80211_dev_free(rdev);
 }
 
-#ifdef CONFIG_HOTPLUG
 static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         /* TODO, we probably need stuff here */
         return 0;
 }
-#endif
 
 static int wiphy_suspend(struct device *dev, pm_message_t state)
 {
@@ -132,9 +130,7 @@ struct class ieee80211_class = {
         .owner = THIS_MODULE,
         .dev_release = wiphy_dev_release,
         .dev_attrs = ieee80211_dev_attrs,
-#ifdef CONFIG_HOTPLUG
         .dev_uevent = wiphy_uevent,
-#endif
         .suspend = wiphy_suspend,
         .resume = wiphy_resume,
         .ns_type = &net_ns_type_operations,
diff --git a/net/wireless/wext-proc.c b/net/wireless/wext-proc.c
index 8bafa31fa9f8..e98a01c1034f 100644
--- a/net/wireless/wext-proc.c
+++ b/net/wireless/wext-proc.c
@@ -143,7 +143,8 @@ static const struct file_operations wireless_seq_fops = {
 int __net_init wext_proc_init(struct net *net)
 {
         /* Create /proc/net/wireless entry */
-        if (!proc_net_fops_create(net, "wireless", S_IRUGO, &wireless_seq_fops))
+        if (!proc_create("wireless", S_IRUGO, net->proc_net,
+                         &wireless_seq_fops))
                 return -ENOMEM;
 
         return 0;
@@ -151,5 +152,5 @@ int __net_init wext_proc_init(struct net *net)
 
 void __net_exit wext_proc_exit(struct net *net)
 {
-        proc_net_remove(net, "wireless");
+        remove_proc_entry("wireless", net->proc_net);
 }