1 files changed, 59 insertions, 0 deletions
diff --git a/d4.patch b/d4.patch
new file mode 100644
index 00000000000000..b05fc0ca61deb1
--- /dev/null
+++ b/d4.patch
@@ -0,0 +1,59 @@
+---
+ 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)
+ {
+@@ -144,7 +147,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,
+ 	.suspend = wiphy_suspend,
+ 	.resume = wiphy_resume,