| From 6d91857d4826b382b3fd4fad95f52713be646f96 Mon Sep 17 00:00:00 2001 |
| From: Behan Webster <behanw@converseincode.com> |
| Date: Wed, 29 Oct 2014 15:42:20 -0700 |
| Subject: staging, rtl8192e, LLVMLinux: Change extern inline to static inline |
| |
| From: Behan Webster <behanw@converseincode.com> |
| |
| commit 6d91857d4826b382b3fd4fad95f52713be646f96 upstream. |
| |
| With compilers which follow the C99 standard (like modern versions of gcc and |
| clang), "extern inline" does the opposite thing from older versions of gcc |
| (emits code for an externally linkable version of the inline function). |
| |
| "static inline" does the intended behavior in all cases instead. |
| |
| Signed-off-by: Behan Webster <behanw@converseincode.com> |
| Suggested-by: Arnd Bergmann <arnd@arndb.de> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/staging/rtl8192e/rtllib.h | 4 ++-- |
| drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/staging/rtl8192e/rtllib.h |
| +++ b/drivers/staging/rtl8192e/rtllib.h |
| @@ -2943,12 +2943,12 @@ void rtllib_softmac_scan_syncro(struct r |
| |
| extern const long rtllib_wlan_frequencies[]; |
| |
| -extern inline void rtllib_increment_scans(struct rtllib_device *ieee) |
| +static inline void rtllib_increment_scans(struct rtllib_device *ieee) |
| { |
| ieee->scans++; |
| } |
| |
| -extern inline int rtllib_get_scans(struct rtllib_device *ieee) |
| +static inline int rtllib_get_scans(struct rtllib_device *ieee) |
| { |
| return ieee->scans; |
| } |
| --- a/drivers/staging/rtl8192e/rtllib_softmac.c |
| +++ b/drivers/staging/rtl8192e/rtllib_softmac.c |
| @@ -341,7 +341,7 @@ inline void softmac_ps_mgmt_xmit(struct |
| } |
| } |
| |
| -inline struct sk_buff *rtllib_probe_req(struct rtllib_device *ieee) |
| +static inline struct sk_buff *rtllib_probe_req(struct rtllib_device *ieee) |
| { |
| unsigned int len, rate_len; |
| u8 *tag; |