mirrors/rtl8188eus
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8188eus.git synced 2026-07-16 21:16:59 +00:00
Code Issues Projects Releases Wiki Activity

replace __attribute__ with fall through to support older versions of GCC

Browse Source
This commit is contained in:
kimocoder
2021-05-04 13:53:22 +02:00
parent acdcc1a06a
commit b83dea7877
5 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -4
View File
@@ -10,10 +10,10 @@ EXTRA_CFLAGS += -Wno-unused
EXTRA_CFLAGS += -Wno-vla EXTRA_CFLAGS += -Wno-vla
EXTRA_CFLAGS += -Wno-date-time EXTRA_CFLAGS += -Wno-date-time
REDHAT_VER := $(shell cut -f4 -d" " /etc/redhat-release |cut -d"." -f1,2 ) #REDHAT_VER := $(shell cut -f4 -d" " /etc/redhat-release |cut -d"." -f1,2 )
ifeq ($(REDHAT_VER), 7.9) #ifeq ($(REDHAT_VER), 7.9)
EXTRA_CFLAGS += -DRHEL79 #EXTRA_CFLAGS += -DRHEL79
endif #endif
GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc ) GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
ifeq ($(GCC_VER_49),1) ifeq ($(GCC_VER_49),1)
core/rtw_mlme_ext.c
+1 -5
View File
@@ -1831,11 +1831,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
ptable->func = &OnAuth; ptable->func = &OnAuth;
else else
ptable->func = &OnAuthClient; ptable->func = &OnAuthClient;
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* fall through */
__attribute__ ((fallthrough));
#else
__attribute__ ((__fallthrough__));
#endif
case WIFI_ASSOCREQ: case WIFI_ASSOCREQ:
case WIFI_REASSOCREQ: case WIFI_REASSOCREQ:
_mgt_dispatcher(padapter, ptable, precv_frame); _mgt_dispatcher(padapter, ptable, precv_frame);
hal/hal_intf.c
+1 -2
View File
@@ -939,8 +939,7 @@ s32 c2h_handler(_adapter *adapter, u8 id, u8 seq, u8 plen, u8 *payload)
#endif #endif
case C2H_EXTEND: case C2H_EXTEND:
sub_id = payload[0]; sub_id = payload[0];
__attribute__ ((__fallthrough__)); /* fall through */
default: default:
if (phydm_c2H_content_parsing(adapter_to_phydm(adapter), id, plen, payload) != TRUE) if (phydm_c2H_content_parsing(adapter_to_phydm(adapter), id, plen, payload) != TRUE)
ret = _FAIL; ret = _FAIL;
os_dep/linux/ioctl_cfg80211.c
+2 -2
View File
@@ -2365,7 +2365,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_P2P_CLIENT:
is_p2p = _TRUE; is_p2p = _TRUE;
#endif #endif
__attribute__ ((__fallthrough__)); /* fall through */
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
networkType = Ndis802_11Infrastructure; networkType = Ndis802_11Infrastructure;
@@ -2390,7 +2390,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_P2P_GO:
is_p2p = _TRUE; is_p2p = _TRUE;
#endif #endif
__attribute__ ((__fallthrough__)); /* fall through */
case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP:
networkType = Ndis802_11APMode; networkType = Ndis802_11APMode;
os_dep/linux/ioctl_linux.c
+5 -6
View File
@@ -10113,15 +10113,15 @@ static int rtw_priv_mp_get(struct net_device *dev,
RTW_INFO("mp_get EFUSE_MASK\n"); RTW_INFO("mp_get EFUSE_MASK\n");
rtw_efuse_mask_file(dev, info, wdata, extra); rtw_efuse_mask_file(dev, info, wdata, extra);
break; break;
case EFUSE_FILE: case EFUSE_FILE:
RTW_INFO("mp_get EFUSE_FILE\n"); RTW_INFO("mp_get EFUSE_FILE\n");
rtw_efuse_file_map(dev, info, wdata, extra); rtw_efuse_file_map(dev, info, wdata, extra);
break; break;
case MP_TX: case MP_TX:
RTW_INFO("mp_get MP_TX\n"); RTW_INFO("mp_get MP_TX\n");
rtw_mp_tx(dev, info, wdata, extra); rtw_mp_tx(dev, info, wdata, extra);
break; break;
case MP_RX: case MP_RX:
RTW_INFO("mp_get MP_RX\n"); RTW_INFO("mp_get MP_RX\n");
rtw_mp_rx(dev, info, wdata, extra); rtw_mp_rx(dev, info, wdata, extra);
break; break;
@@ -10143,11 +10143,11 @@ static int rtw_priv_mp_get(struct net_device *dev,
RTW_INFO("mp_get MP_SETPWRBYRATE\n"); RTW_INFO("mp_get MP_SETPWRBYRATE\n");
rtw_mp_pwrbyrate(dev, info, wdata, extra); rtw_mp_pwrbyrate(dev, info, wdata, extra);
break; break;
case BT_EFUSE_FILE: case BT_EFUSE_FILE:
RTW_INFO("mp_get BT EFUSE_FILE\n"); RTW_INFO("mp_get BT EFUSE_FILE\n");
rtw_bt_efuse_file_map(dev, info, wdata, extra); rtw_bt_efuse_file_map(dev, info, wdata, extra);
break; break;
case MP_SWRFPath: case MP_SWRFPath:
RTW_INFO("mp_get MP_SWRFPath\n"); RTW_INFO("mp_get MP_SWRFPath\n");
rtw_mp_switch_rf_path(dev, info, wrqu, extra); rtw_mp_switch_rf_path(dev, info, wrqu, extra);
break; break;
@@ -10159,7 +10159,6 @@ static int rtw_priv_mp_get(struct net_device *dev,
} }
#endif /*#if defined(CONFIG_MP_INCLUDED)*/ #endif /*#if defined(CONFIG_MP_INCLUDED)*/
#ifdef CONFIG_SDIO_INDIRECT_ACCESS #ifdef CONFIG_SDIO_INDIRECT_ACCESS
#define DBG_MP_SDIO_INDIRECT_ACCESS 1 #define DBG_MP_SDIO_INDIRECT_ACCESS 1
static int rtw_mp_sd_iread(struct net_device *dev static int rtw_mp_sd_iread(struct net_device *dev