summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-12-02 15:28:01 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-06 23:28:11 +0100
commit6838b1c0cbef41aef3f7f7c715fa15bb6bf5cbb0 (patch)
treeb01d5fe6d6464b250c192f3b94d9d0859887583d
parentd004b8fd01a3ac06389e2d1feffab2efadd426ef (diff)
backports: Add missing includes for mt76 driver.
This patch was taken from kernel 4.20. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/0013-fix-makefile-includes/mt76.patch49
-rw-r--r--patches/0090-use-skb_pad.patch2
2 files changed, 50 insertions, 1 deletions
diff --git a/patches/0013-fix-makefile-includes/mt76.patch b/patches/0013-fix-makefile-includes/mt76.patch
new file mode 100644
index 00000000..9edf61f2
--- /dev/null
+++ b/patches/0013-fix-makefile-includes/mt76.patch
@@ -0,0 +1,49 @@
+From db6bb5c6c19451faa935934e6b45416fd7dd777a Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@nbd.name>
+Date: Mon, 24 Sep 2018 11:13:11 +0200
+Subject: mt76: include linux/module.h in files using MODULE_*
+
+Fix source files using MODULE_* macros without including linux/module.h
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+
+--- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
++++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
+@@ -13,6 +13,7 @@
+ * GNU General Public License for more details.
+ */
+
++#include <linux/module.h>
+ #include <linux/of.h>
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+--- a/drivers/net/wireless/mediatek/mt76/usb_mcu.c
++++ b/drivers/net/wireless/mediatek/mt76/usb_mcu.c
+@@ -14,6 +14,7 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include <linux/module.h>
+ #include <linux/firmware.h>
+
+ #include "mt76.h"
+--- a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
++++ b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
+@@ -14,6 +14,7 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include <linux/module.h>
+ #include <asm/unaligned.h>
+ #include "mt76x2.h"
+ #include "mt76x2_eeprom.h"
+--- a/drivers/net/wireless/mediatek/mt76/usb.c
++++ b/drivers/net/wireless/mediatek/mt76/usb.c
+@@ -14,6 +14,7 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include <linux/module.h>
+ #include "mt76.h"
+ #include "usb_trace.h"
+ #include "dma.h"
diff --git a/patches/0090-use-skb_pad.patch b/patches/0090-use-skb_pad.patch
index 086328c1..9f29d6cb 100644
--- a/patches/0090-use-skb_pad.patch
+++ b/patches/0090-use-skb_pad.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
-@@ -535,7 +535,7 @@ int mt76u_skb_dma_info(struct sk_buff *s
+@@ -536,7 +536,7 @@ int mt76u_skb_dma_info(struct sk_buff *s
}
if (unlikely(pad)) {