From 2697ac2ee2d578ea25e7513f80b8f46a83bdc2ba Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sun, 6 Aug 2017 19:07:46 +0300 Subject: [PATCH] Cleanup for the sun8i drivers migration --- config/kernel/linux-sun8i-default.config | 2 +- .../sun8i-default/0016-gcc5-fixes.patch | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/config/kernel/linux-sun8i-default.config b/config/kernel/linux-sun8i-default.config index a697a4e62e..c8416598eb 100644 --- a/config/kernel/linux-sun8i-default.config +++ b/config/kernel/linux-sun8i-default.config @@ -1573,7 +1573,6 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m @@ -1599,6 +1598,7 @@ CONFIG_XRADIO_USE_EXTENSIONS=y CONFIG_RTL8188EU=m CONFIG_RTL8189ES=m CONFIG_RTL8189FS=m +CONFIG_RTL8192CU=m CONFIG_RTL8723BS=m # CONFIG_RTL8723BS_VQ0 is not set diff --git a/patch/kernel/sun8i-default/0016-gcc5-fixes.patch b/patch/kernel/sun8i-default/0016-gcc5-fixes.patch index ed151f4ab7..c329621928 100644 --- a/patch/kernel/sun8i-default/0016-gcc5-fixes.patch +++ b/patch/kernel/sun8i-default/0016-gcc5-fixes.patch @@ -38,32 +38,6 @@ index fc293c4..0898cd4 100755 (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); } --extern __inline int is_zero_mac_addr(const u8 *addr) -+static __inline int is_zero_mac_addr(const u8 *addr) - { - return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ - (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); -diff --git a/drivers/net/wireless/rtl8189es/include/ieee80211.h b/drivers/net/wireless/rtl8189es/include/ieee80211.h -index fc293c4..0898cd4 100755 ---- a/drivers/net/wireless/rtl8189es/include/ieee80211.h -+++ b/drivers/net/wireless/rtl8189es/include/ieee80211.h -@@ -1314,18 +1314,18 @@ enum ieee80211_state { - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) - #else --extern __inline int is_multicast_mac_addr(const u8 *addr) -+static __inline int is_multicast_mac_addr(const u8 *addr) - { - return ((addr[0] != 0xff) && (0x01 & addr[0])); - } - --extern __inline int is_broadcast_mac_addr(const u8 *addr) -+static __inline int is_broadcast_mac_addr(const u8 *addr) - { - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); - } - -extern __inline int is_zero_mac_addr(const u8 *addr) +static __inline int is_zero_mac_addr(const u8 *addr) {