Skip to content

Commit e14af2d

Browse files
committed
drivers/net/wireless: Fix gcc-10 -Wrestrict
Fixes errors such as: drivers/net/wireless/rtl8821cu/os_dep/linux/ioctl_mp.c: In function 'rtw_mp_txpower_index': drivers/net/wireless/rtl8821cu/os_dep/linux/ioctl_mp.c:573:4: warning: 'sprintf' argument 3 overlaps destination object 'extra' [-Wrestrict] error, forbidden warning:ioctl_mp.c:573 573 | sprintf(extra, "%s,pathb=%d", extra, txpower_inx); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/wireless/rtl8821cu/os_dep/linux/ioctl_mp.c:546:34: note: destination object referenced by 'restrict'-qualified argument 1 was declared here 546 | struct iw_point *wrqu, char *extra) | ~~~~~~^~~~~ Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com>
1 parent c7c2392 commit e14af2d

File tree

36 files changed

+1129
-972
lines changed

36 files changed

+1129
-972
lines changed

drivers/net/wireless/ew-7611ulb/core/rtw_mp.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,14 +2093,17 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
20932093

20942094
data[0] = '\0';
20952095

2096-
i = psd_start;
2097-
while (i < psd_stop) {
2098-
if (i >= psd_pts)
2099-
psd_data = rtw_GetPSDData(pAdapter, i - psd_pts);
2100-
else
2101-
psd_data = rtw_GetPSDData(pAdapter, i);
2102-
sprintf(data, "%s%x ", data, psd_data);
2103-
i++;
2096+
{
2097+
size_t extra_len = strlen(data);
2098+
i = psd_start;
2099+
while (i < psd_stop) {
2100+
if (i >= psd_pts)
2101+
psd_data = rtw_GetPSDData(pAdapter, i - psd_pts);
2102+
else
2103+
psd_data = rtw_GetPSDData(pAdapter, i);
2104+
extra_len += sprintf(data + extra_len, "%x ", psd_data);
2105+
i++;
2106+
}
21042107
}
21052108

21062109
#ifdef CONFIG_LONG_DELAY_ISSUE

drivers/net/wireless/ew-7611ulb/os_dep/linux/ioctl_mp.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ int rtw_mp_tx(struct net_device *dev,
17191719
char *pextra = extra;
17201720
RTW_INFO("Got format [ch=%d,bw=%d,rate=%d,pwr=%d,ant=%d,tx=%d]\n", channel, bandwidth, rate, txpower, ant, txmode);
17211721
_rtw_memset(extra, 0, wrqu->data.length);
1722-
sprintf(extra, "Change Current channel %d to channel %d", padapter->mppriv.channel , channel);
1722+
pextra += sprintf(pextra, "Change Current channel %d to channel %d", padapter->mppriv.channel , channel);
17231723
padapter->mppriv.channel = channel;
17241724
SetChannel(padapter);
17251725
pHalData->current_channel = channel;
@@ -2074,6 +2074,7 @@ int rtw_efuse_mask_file(struct net_device *dev,
20742074
u8 count = 0;
20752075
u8 i = 0;
20762076
u32 datalen = 0;
2077+
size_t extra_len;
20772078

20782079
ptmp = extra;
20792080
pch = strsep(&ptmp, ",");
@@ -2099,12 +2100,13 @@ int rtw_efuse_mask_file(struct net_device *dev,
20992100

21002101
} while (count < 64);
21012102

2103+
extra_len = strlen(extra);
21022104
for (i = 0; i < count; i++)
2103-
sprintf(extra, "%s:%02x", extra, maskfileBuffer[i]);
2105+
extra_len += sprintf(extra + extra_len, ":%02x", maskfileBuffer[i]);
21042106

21052107
padapter->registrypriv.bFileMaskEfuse = _TRUE;
21062108

2107-
sprintf(extra, "%s\nLoad Efuse Mask data %d hex ok\n", extra, count);
2109+
extra_len += sprintf(extra + extra_len, "\nLoad Efuse Mask data %d hex ok\n", count);
21082110
wrqu->data.length = strlen(extra);
21092111
return 0;
21102112
}
@@ -2522,16 +2524,18 @@ int rtw_mp_SetBT(struct net_device *dev,
25222524
mptbt_BtControlProcess(padapter, &BtReq);
25232525

25242526
if (readtherm == 0) {
2527+
size_t extra_len;
25252528
sprintf(extra, "BT thermal=");
25262529
for (i = 4; i < pMptCtx->mptOutLen; i++) {
25272530
if ((pMptCtx->mptOutBuf[i] == 0x00) && (pMptCtx->mptOutBuf[i + 1] == 0x00))
25282531
goto exit;
25292532

2530-
sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i] & 0x1f));
2533+
extra_len += sprintf(extra + extra_len, " %d ", (pMptCtx->mptOutBuf[i] & 0x1f));
25312534
}
25322535
} else {
2536+
size_t extra_len;
25332537
for (i = 4; i < pMptCtx->mptOutLen; i++)
2534-
sprintf(extra, "%s 0x%x ", extra, pMptCtx->mptOutBuf[i]);
2538+
extra_len += sprintf(extra + extra_len, " 0x%x ", pMptCtx->mptOutBuf[i]);
25352539
}
25362540

25372541
exit:

drivers/net/wireless/rockchip_wlan/rtl8188eu/core/rtw_mp.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2119,14 +2119,17 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
21192119

21202120
data[0] = '\0';
21212121

2122-
i = psd_start;
2123-
while (i < psd_stop) {
2124-
if (i >= psd_pts)
2125-
psd_data = rtw_GetPSDData(pAdapter, i - psd_pts);
2126-
else
2127-
psd_data = rtw_GetPSDData(pAdapter, i);
2128-
sprintf(data, "%s%x ", data, psd_data);
2129-
i++;
2122+
{
2123+
size_t extra_len = strlen(data);
2124+
i = psd_start;
2125+
while (i < psd_stop) {
2126+
if (i >= psd_pts)
2127+
psd_data = rtw_GetPSDData(pAdapter, i - psd_pts);
2128+
else
2129+
psd_data = rtw_GetPSDData(pAdapter, i);
2130+
extra_len += sprintf(data + extra_len, "%x ", psd_data);
2131+
i++;
2132+
}
21302133
}
21312134

21322135
#ifdef CONFIG_LONG_DELAY_ISSUE

0 commit comments

Comments
 (0)