mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-22 14:51:41 +00:00
96 lines
3.7 KiB
Diff
96 lines
3.7 KiB
Diff
From acdcb2a675ed117c97e321ddf3a4e077994b1e43 Mon Sep 17 00:00:00 2001
|
|
From: Trevor Woerner <twoerner@gmail.com>
|
|
Date: Thu, 24 Sep 2015 17:07:26 -0400
|
|
Subject: [PATCH 16/27] gcc5 fixes
|
|
|
|
gcc5 is pickier about inline functions defined in headers.
|
|
|
|
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
|
|
|
|
Adjusted to this source tree.
|
|
|
|
Signed-off-by: Yann Dirson <ydirson@o-computers.com>
|
|
---
|
|
drivers/net/wireless/rtl8188eu/include/ieee80211.h | 6 +++---
|
|
drivers/net/wireless/rtl8189es/include/ieee80211.h | 6 +++---
|
|
drivers/net/wireless/rtl8723bs/include/ieee80211.h | 6 +++---
|
|
drivers/staging/rtl8712/ieee80211.h | 4 ++--
|
|
4 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/rtl8188eu/include/ieee80211.h b/drivers/net/wireless/rtl8188eu/include/ieee80211.h
|
|
index fc293c4..0898cd4 100755
|
|
--- a/drivers/net/wireless/rtl8188eu/include/ieee80211.h
|
|
+++ b/drivers/net/wireless/rtl8188eu/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/rtl8723bs/include/ieee80211.h b/drivers/net/wireless/rtl8723bs/include/ieee80211.h
|
|
index fc293c4..0898cd4 100755
|
|
--- a/drivers/net/wireless/rtl8723bs/include/ieee80211.h
|
|
+++ b/drivers/net/wireless/rtl8723bs/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/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
|
|
index 3c0092b..1e7b55b 100644
|
|
--- a/drivers/staging/rtl8712/ieee80211.h
|
|
+++ b/drivers/staging/rtl8712/ieee80211.h
|
|
@@ -734,7 +734,7 @@ enum ieee80211_state {
|
|
#define IEEE_G (1<<2)
|
|
#define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G)
|
|
|
|
-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
|
|
+static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
|
|
{
|
|
/* Single white space is for Linksys APs */
|
|
if (essid_len == 1 && essid[0] == ' ')
|
|
@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
|
|
return 1;
|
|
}
|
|
|
|
-extern inline int ieee80211_get_hdrlen(u16 fc)
|
|
+static inline int ieee80211_get_hdrlen(u16 fc)
|
|
{
|
|
int hdrlen = 24;
|
|
|
|
--
|
|
1.9.1
|
|
|