|
@@ -0,0 +1,121 @@
|
|
|
+From ef34609395c72a1e777ef9c3fb6ce60aa92976bb Mon Sep 17 00:00:00 2001
|
|
|
+From: Marco Franceschetti <vonfritz1@gmail.com>
|
|
|
+Date: Sun, 13 Mar 2016 09:44:54 +0100
|
|
|
+Subject: [PATCH] Fix compile errors with gcc5
|
|
|
+
|
|
|
+(cherry picked from commit e824d45043efd49607f66c89c921b07c1523bf9e)
|
|
|
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
|
+---
|
|
|
+ drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h | 6 +++---
|
|
|
+ drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h | 6 +++---
|
|
|
+ drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h | 6 +++---
|
|
|
+ drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h | 6 +++---
|
|
|
+ 4 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
+
|
|
|
+diff --git a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
|
|
|
+index fc293c4..0898cd4 100755
|
|
|
+--- a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
|
|
|
++++ b/drivers/net/wireless/actions/rtl8188etv/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)
|
|
|
+ {
|
|
|
+ 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/actions/rtl8723bs/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
|
|
|
+index 09475ef..56e0f5a 100755
|
|
|
+--- a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
|
|
|
++++ b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
|
|
|
+@@ -1318,18 +1318,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)
|
|
|
+ {
|
|
|
+ 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/actions/rtl8723bs_vq0/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
|
|
|
+index 5dfc421..95144b6 100755
|
|
|
+--- a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
|
|
|
++++ b/drivers/net/wireless/actions/rtl8723bs_vq0/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)
|
|
|
+ {
|
|
|
+ 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/actions/rtl8723bu/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
|
|
|
+index 09475ef..56e0f5a 100755
|
|
|
+--- a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
|
|
|
++++ b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
|
|
|
+@@ -1318,18 +1318,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)
|
|
|
+ {
|
|
|
+ return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
|
|
|
+ (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
|
|
|
+--
|
|
|
+2.10.2
|
|
|
+
|