aboutsummaryrefslogtreecommitdiffstats
path: root/net-wireless-convert-class-code-to-use-dev_groups.patch
diff options
Diffstat (limited to 'net-wireless-convert-class-code-to-use-dev_groups.patch')
-rw-r--r--net-wireless-convert-class-code-to-use-dev_groups.patch75
1 files changed, 0 insertions, 75 deletions
diff --git a/net-wireless-convert-class-code-to-use-dev_groups.patch b/net-wireless-convert-class-code-to-use-dev_groups.patch
deleted file mode 100644
index 1c15569d5ba047..00000000000000
--- a/net-wireless-convert-class-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From foo@baz Tue Jul 9 16:21:34 PDT 2013
-Date: Tue, 09 Jul 2013 16:21:34 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: net: wireless: convert class code to use dev_groups
-
-The dev_attrs field of struct class is going away soon, dev_groups
-should be used instead. This converts the networking wireless class
-code to use the correct field.
-
-Cc: Johannes Berg <johannes@sipsolutions.net>
-Cc: John W. Linville <linville@tuxdriver.com>
-Cc: linux-wireless@vger.kernel.org
-Cc: netdev@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/wireless/sysfs.c | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
---- a/net/wireless/sysfs.c
-+++ b/net/wireless/sysfs.c
-@@ -30,7 +30,8 @@ static ssize_t name ## _show(struct devi
- char *buf) \
- { \
- return sprintf(buf, fmt "\n", dev_to_rdev(dev)->member); \
--}
-+} \
-+static DEVICE_ATTR_RO(name)
-
- SHOW_FMT(index, "%d", wiphy_idx);
- SHOW_FMT(macaddress, "%pM", wiphy.perm_addr);
-@@ -42,7 +43,7 @@ static ssize_t name_show(struct device *
- struct wiphy *wiphy = &dev_to_rdev(dev)->wiphy;
- return sprintf(buf, "%s\n", dev_name(&wiphy->dev));
- }
--
-+static DEVICE_ATTR_RO(name);
-
- static ssize_t addresses_show(struct device *dev,
- struct device_attribute *attr,
-@@ -60,15 +61,17 @@ static ssize_t addresses_show(struct dev
-
- return buf - start;
- }
-+static DEVICE_ATTR_RO(addresses);
-
--static struct device_attribute ieee80211_dev_attrs[] = {
-- __ATTR_RO(index),
-- __ATTR_RO(macaddress),
-- __ATTR_RO(address_mask),
-- __ATTR_RO(addresses),
-- __ATTR_RO(name),
-- {}
-+static struct attribute *ieee80211_attrs[] = {
-+ &dev_attr_index.attr,
-+ &dev_attr_macaddress.attr,
-+ &dev_attr_address_mask.attr,
-+ &dev_attr_addresses.attr,
-+ &dev_attr_name.attr,
-+ NULL,
- };
-+ATTRIBUTE_GROUPS(ieee80211);
-
- static void wiphy_dev_release(struct device *dev)
- {
-@@ -146,7 +149,7 @@ struct class ieee80211_class = {
- .name = "ieee80211",
- .owner = THIS_MODULE,
- .dev_release = wiphy_dev_release,
-- .dev_attrs = ieee80211_dev_attrs,
-+ .dev_groups = ieee80211_groups,
- .dev_uevent = wiphy_uevent,
- #ifdef CONFIG_PM
- .suspend = wiphy_suspend,