mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-21 22:31:51 +00:00
145 lines
5.8 KiB
Diff
145 lines
5.8 KiB
Diff
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
|
|
index f89515a..2bb8cac 100644
|
|
--- a/arch/arm/include/asm/ftrace.h
|
|
+++ b/arch/arm/include/asm/ftrace.h
|
|
@@ -45,7 +45,7 @@ void *return_address(unsigned int);
|
|
|
|
#else
|
|
|
|
-extern inline void *return_address(unsigned int level)
|
|
+static inline void *return_address(unsigned int level)
|
|
{
|
|
return NULL;
|
|
}
|
|
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
|
|
index 8085417..57827a6 100644
|
|
--- a/arch/arm/kernel/return_address.c
|
|
+++ b/arch/arm/kernel/return_address.c
|
|
@@ -62,11 +62,6 @@ void *return_address(unsigned int level)
|
|
#warning "TODO: return_address should use unwind tables"
|
|
#endif
|
|
|
|
-void *return_address(unsigned int level)
|
|
-{
|
|
- return NULL;
|
|
-}
|
|
-
|
|
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
|
|
|
|
EXPORT_SYMBOL_GPL(return_address);
|
|
diff --git a/drivers/net/wireless/rtl8188eu/include/ieee80211.h b/drivers/net/wireless/rtl8188eu/include/ieee80211.h
|
|
index 1ae96a5..7a301c5 100644
|
|
--- a/drivers/net/wireless/rtl8188eu/include/ieee80211.h
|
|
+++ b/drivers/net/wireless/rtl8188eu/include/ieee80211.h
|
|
@@ -1188,12 +1188,12 @@ 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));
|
|
diff --git a/drivers/net/wireless/rtl8189es/include/ieee80211.h b/drivers/net/wireless/rtl8189es/include/ieee80211.h
|
|
index 1ae96a5..7a301c5 100644
|
|
--- a/drivers/net/wireless/rtl8189es/include/ieee80211.h
|
|
+++ b/drivers/net/wireless/rtl8189es/include/ieee80211.h
|
|
@@ -1188,12 +1188,12 @@ 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));
|
|
diff --git a/drivers/net/wireless/rtl8192cu/include/ieee80211.h b/drivers/net/wireless/rtl8192cu/include/ieee80211.h
|
|
index 86e9726..950691d 100644
|
|
--- a/drivers/net/wireless/rtl8192cu/include/ieee80211.h
|
|
+++ b/drivers/net/wireless/rtl8192cu/include/ieee80211.h
|
|
@@ -1149,12 +1149,12 @@ enum ieee80211_state {
|
|
#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
|
|
#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
|
|
|
|
-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));
|
|
@@ -1177,7 +1177,7 @@ typedef struct tx_pending_t{
|
|
#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] == ' ')
|
|
@@ -1193,7 +1193,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;
|
|
|
|
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;
|
|
|
|
diff --git a/drivers/net/wireless/rtl8723as/include/ieee80211.h b/drivers/net/wireless/rtl8723as/include/ieee80211.h
|
|
index bf24c3b..f8046ee 100644
|
|
--- a/drivers/net/wireless/rtl8723as/include/ieee80211.h
|
|
+++ b/drivers/net/wireless/rtl8723as/include/ieee80211.h
|
|
@@ -1176,12 +1176,12 @@ 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));
|