diff options
| author | Greg Kroah-Hartman | 2019-01-28 08:17:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-28 08:17:02 +0100 |
| commit | d61b5d546af21e886aafcc9182f5ac5935a3177d (patch) | |
| tree | 448b389768a74efb604dd22ea2a5d43686ea3be5 /drivers/staging/rtl8723bs | |
| parent | staging: erofs: fix potential double iput in erofs_read_super() (diff) | |
| parent | Linux 5.0-rc4 (diff) | |
| download | kernel-qcow2-linux-d61b5d546af21e886aafcc9182f5ac5935a3177d.tar.gz kernel-qcow2-linux-d61b5d546af21e886aafcc9182f5ac5935a3177d.tar.xz kernel-qcow2-linux-d61b5d546af21e886aafcc9182f5ac5935a3177d.zip | |
Merge 5.0-rc4 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs')
| -rw-r--r-- | drivers/staging/rtl8723bs/include/ieee80211.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h index bcc8dfa8e672..9efb4dcb9d3a 100644 --- a/drivers/staging/rtl8723bs/include/ieee80211.h +++ b/drivers/staging/rtl8723bs/include/ieee80211.h @@ -850,18 +850,18 @@ enum ieee80211_state { #define IP_FMT "%pI4" #define IP_ARG(x) (x) -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)); |