Sophie

Sophie

distrib > Mageia > 7 > x86_64 > by-pkgid > 756cec81f2415651b9b72345f711e486 > files > 23

kernel-5.5.6-2.mga7.src.rpm


Kernel 5.4 expects the new /* fall through */ marking

Signed-off-by: Thomas Backlund <tmb@mageia.org>

 3rdparty/rtl8821ce/core/rtw_mlme_ext.c                       |    4 ++--
 3rdparty/rtl8821ce/hal/hal_halmac.c                          |    2 +-
 3rdparty/rtl8821ce/hal/hal_intf.c                            |    2 +-
 3rdparty/rtl8821ce/hal/halmac/halmac_88xx/halmac_mimo_88xx.c |    4 ++--
 3rdparty/rtl8821ce/os_dep/linux/ioctl_cfg80211.c             |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

--- ./3rdparty/rtl8821ce/core/rtw_mlme_ext.c.orig	2019-11-30 21:20:53.475871731 +0200
+++ ./3rdparty/rtl8821ce/core/rtw_mlme_ext.c	2019-11-30 22:44:17.056129862 +0200
@@ -258,7 +258,7 @@ void rtw_txpwr_init_regd(struct rf_ctl_t
 		);
 		if (rfctl->regd_name)
 			break;
-		__attribute__ ((fallthrough));
+		/* fall through */
 	default:
 		rfctl->regd_name = regd_str(TXPWR_LMT_WW);
 		RTW_PRINT("assign %s for default case\n", regd_str(TXPWR_LMT_WW));
@@ -1328,7 +1328,7 @@ void mgt_dispatcher(_adapter *padapter,
 			ptable->func = &OnAuth;
 		else
 			ptable->func = &OnAuthClient;
-		__attribute__ ((fallthrough));
+		/* fall through */
 	case WIFI_ASSOCREQ:
 	case WIFI_REASSOCREQ:
 		_mgt_dispatcher(padapter, ptable, precv_frame);
--- ./3rdparty/rtl8821ce/hal/halmac/halmac_88xx/halmac_mimo_88xx.c.orig	2019-11-30 21:20:53.476871731 +0200
+++ ./3rdparty/rtl8821ce/hal/halmac/halmac_88xx/halmac_mimo_88xx.c	2019-11-30 22:49:20.709145527 +0200
@@ -62,10 +62,10 @@ cfg_txbf_88xx(struct halmac_adapter *ada
 		switch (bw) {
 		case HALMAC_BW_80:
 			tmp42c |= BIT_R_TXBF0_80M;
-			__attribute__ ((fallthrough));
+			/* fall through */
 		case HALMAC_BW_40:
 			tmp42c |= BIT_R_TXBF0_40M;
-			__attribute__ ((fallthrough));
+			/* fall through */
 		case HALMAC_BW_20:
 			tmp42c |= BIT_R_TXBF0_20M;
 			break;
--- ./3rdparty/rtl8821ce/hal/hal_intf.c.orig	2019-11-30 21:20:53.476871731 +0200
+++ ./3rdparty/rtl8821ce/hal/hal_intf.c	2019-11-30 22:50:07.996147966 +0200
@@ -1070,7 +1070,7 @@ s32 c2h_handler(_adapter *adapter, u8 id
 #endif
 	case C2H_EXTEND:
 		sub_id = payload[0];
-		__attribute__ ((fallthrough));
+		/* fall through */
 	default:
 		if (phydm_c2H_content_parsing(adapter_to_phydm(adapter), id, plen, payload) != TRUE)
 			ret = _FAIL;
--- ./3rdparty/rtl8821ce/hal/hal_halmac.c.orig	2019-11-30 21:20:53.475871731 +0200
+++ ./3rdparty/rtl8821ce/hal/hal_halmac.c	2019-11-30 22:49:58.955147500 +0200
@@ -2900,7 +2900,7 @@ static int _send_general_info(struct dvo
 	case HALMAC_RET_NO_DLFW:
 		RTW_WARN("%s: halmac_send_general_info() fail because fw not dl!\n",
 			 __FUNCTION__);
-		__attribute__ ((fallthrough));
+		/* fall through */
 	default:
 		return -1;
 	}
--- ./3rdparty/rtl8821ce/os_dep/linux/ioctl_cfg80211.c.orig	2019-11-30 21:20:53.477871731 +0200
+++ ./3rdparty/rtl8821ce/os_dep/linux/ioctl_cfg80211.c	2019-11-30 22:50:44.331149841 +0200
@@ -2350,7 +2350,7 @@ static int cfg80211_rtw_change_iface(str
 	#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 through */
 	#endif
 	case NL80211_IFTYPE_STATION:
 		networkType = Ndis802_11Infrastructure;
@@ -2375,7 +2375,7 @@ static int cfg80211_rtw_change_iface(str
 	#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 through */
 	#endif
 	case NL80211_IFTYPE_AP:
 		networkType = Ndis802_11APMode;