lkml.org 
[lkml]   [2015]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 006/122] staging: rtl8712, rtl8712: avoid lots of build warnings
    Date
    3.13.11-ckt22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 0c9f3a65c5eb7fe1fc611a22eb8a8b71ea865998 upstream.

    The rtl8712 driver has an 'extern inline' function that contains an
    'if', which causes lots of warnings with CONFIG_PROFILE_ALL_BRANCHES
    overriding the definition of 'if':

    drivers/staging/rtl8712/ieee80211.h:759:229: warning: '______f' is static but declared in inline function 'ieee80211_get_hdrlen' which is not static [enabled by default]

    This changes the driver to use 'static inline' instead, which happens
    to be the correct annotation anyway.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Cc: Larry Finger <Larry.Finger@lwfinger.net>
    Cc: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
    drivers/staging/rtl8712/ieee80211.h | 4 ++--
    2 files changed, 7 insertions(+), 7 deletions(-)

    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;

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-06-18 01:21    [W:3.470 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site