From a0e9c1dfc64292dacd8b666413a3832860ae82e8 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 16 Oct 2019 11:18:37 -0500 Subject: [PATCH] rtl8188eu: Fix build with kernel 5.4 Beginning with 5.4.0-rc3, a macro is defined for "fallthrough". For that reason, the attribute statement must use __fallthrough__ instead. Signed-off-by: Larry Finger --- core/rtw_mlme_ext.c | 2 +- hal/hal_intf.c | 2 +- os_dep/ioctl_cfg80211.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index ae2bd06..ef5c416 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -1400,7 +1400,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) ptable->func = &OnAuth; else ptable->func = &OnAuthClient; - __attribute__ ((fallthrough));/* FALL THRU */ + __attribute__ ((__fallthrough__));/* FALL THRU */ case WIFI_ASSOCREQ: case WIFI_REASSOCREQ: _mgt_dispatcher(padapter, ptable, precv_frame); diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 3d440ea..2ca6e68 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -827,7 +827,7 @@ s32 c2h_handler(_adapter *adapter, u8 id, u8 seq, u8 plen, u8 *payload) case C2H_EXTEND: sub_id = payload[0]; - __attribute__ ((fallthrough));/* FALL THRU */ + __attribute__ ((__fallthrough__));/* FALL THRU */ default: if (phydm_c2H_content_parsing(odm, id, plen, payload) != true) ret = _FAIL; diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 3cd1182..0523a3b 100644 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -1749,7 +1749,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, #if defined(CONFIG_P2P) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)) case NL80211_IFTYPE_P2P_CLIENT: is_p2p = true; - __attribute__ ((fallthrough));/* FALL THRU */ + __attribute__ ((__fallthrough__));/* FALL THRU */ #endif case NL80211_IFTYPE_STATION: networkType = Ndis802_11Infrastructure; @@ -1774,7 +1774,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, #if defined(CONFIG_P2P) && ((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)) case NL80211_IFTYPE_P2P_GO: is_p2p = true; - __attribute__ ((fallthrough));/* FALL THRU */ + __attribute__ ((__fallthrough__));/* FALL THRU */ #endif case NL80211_IFTYPE_AP: networkType = Ndis802_11APMode;