You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
100 lines
3.7 KiB
100 lines
3.7 KiB
5 years ago
|
From fa89009a1869844f9a9360eb07c45d457446ac0e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Date: Thu, 5 Jun 2014 22:48:15 +0200
|
||
|
|
Subject: [PATCH] staging: rtl8712, rtl8712: avoid lots of build warnings
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 ++--
|
||
|
|
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
|
||
|
|
drivers/staging/rtl8712/ieee80211.h | 4 ++--
|
||
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
|
||
|
|
index 09ffd9b..6ebdd3f 100644
|
||
|
|
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h
|
||
|
|
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
|
||
|
|
@@ -1460,12 +1460,12 @@ extern void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee,
|
||
|
|
|
||
|
|
extern const long ieee80211_wlan_frequencies[];
|
||
|
|
|
||
|
|
-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
|
||
|
|
+static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
|
||
|
|
{
|
||
|
|
ieee->scans++;
|
||
|
|
}
|
||
|
|
|
||
|
|
-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
|
||
|
|
+static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
|
||
|
|
{
|
||
|
|
return ieee->scans;
|
||
|
|
}
|
||
|
|
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
|
||
|
|
index bc64f05..b1a0380 100644
|
||
|
|
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
|
||
|
|
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
|
||
|
|
@@ -2250,7 +2250,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
|
||
|
|
return ((struct ieee80211_device *)netdev_priv(dev))->priv;
|
||
|
|
}
|
||
|
|
|
||
|
|
-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] == ' ')
|
||
|
|
@@ -2266,7 +2266,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
|
||
|
|
+static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
|
||
|
|
{
|
||
|
|
/*
|
||
|
|
* It is possible for both access points and our device to support
|
||
|
|
@@ -2292,7 +2292,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-extern inline int ieee80211_get_hdrlen(u16 fc)
|
||
|
|
+static inline int ieee80211_get_hdrlen(u16 fc)
|
||
|
|
{
|
||
|
|
int hdrlen = IEEE80211_3ADDR_LEN;
|
||
|
|
|
||
|
|
@@ -2578,12 +2578,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
|
||
|
|
|
||
|
|
extern const long ieee80211_wlan_frequencies[];
|
||
|
|
|
||
|
|
-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
|
||
|
|
+static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
|
||
|
|
{
|
||
|
|
ieee->scans++;
|
||
|
|
}
|
||
|
|
|
||
|
|
-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
|
||
|
|
+static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
|
||
|
|
{
|
||
|
|
return ieee->scans;
|
||
|
|
}
|
||
|
|
diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
|
||
|
|
index da4000e..8269be8 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;
|
||
|
|
|
||
|
|
--
|
||
|
|
libgit2 0.22.2
|