package/mac80211: sync ozonet patch to upstream changes

diff --git a/package/kernel/mac80211/patches/999-disable_leds.patch b/package/kernel/mac80211/patches/999-disable_leds.patch
index 9f0a6878d76f13cdce9c40d756379c6a45b4b068..c99975110acb1503053ddde2391cb51841bc069d 100644 (file)
--- a/package/kernel/mac80211/patches/999-disable_leds.patch
+++ b/package/kernel/mac80211/patches/999-disable_leds.patch
@@ -69,23 +69,44 @@
  
 --- a/compat/backport-4.5.c    2016-06-26 19:56:17.000000000 +0300
 +++ b/compat/backport-4.5.c    2016-07-22 01:26:00.616256328 +0300
-@@ -13,7 +13,6 @@
+@@ -8,17 +8,18 @@
+  * published by the Free Software Foundation.
+  */
+ 
+-#include <linux/leds.h>
+ #include <linux/device.h>
  #include <linux/export.h>
  #include <linux/errno.h>
  #include <linux/fs.h>
 -#include <linux/leds.h>
- #include <linux/phy.h>
  #include <linux/printk.h>
  #include <linux/slab.h>
-@@ -124,6 +123,7 @@ void phy_attached_print(struct phy_devic
+ #include <linux/string.h>
+ #include <asm/uaccess.h>
+ 
++#ifdef CPTCFG_MAC80211_LEDS
++#include <linux/leds.h>
++
+ #if LINUX_VERSION_IS_GEQ(3,19,0)
+ int led_set_brightness_sync(struct led_classdev *led_cdev,
+                           enum led_brightness value)
+@@ -38,6 +39,7 @@ int led_set_brightness_sync(struct led_c
+ }
+ EXPORT_SYMBOL_GPL(led_set_brightness_sync);
+ #endif /* >= 3.19 */
++#endif
+ 
+ #if LINUX_VERSION_IS_GEQ(3,2,0)
+ /**
+@@ -96,6 +98,7 @@ void *memdup_user_nul(const void __user
  }
- EXPORT_SYMBOL_GPL(phy_attached_print);
+ EXPORT_SYMBOL_GPL(memdup_user_nul);
  
 +#ifdef CPTCFG_MAC80211_LEDS
  static void devm_led_trigger_release(struct device *dev, void *res)
  {
        led_trigger_unregister(*(struct led_trigger **)res);
-@@ -151,3 +151,4 @@ int devm_led_trigger_register(struct dev
+@@ -123,3 +126,4 @@ int devm_led_trigger_register(struct dev
        return rc;
  }
  EXPORT_SYMBOL_GPL(devm_led_trigger_register);