Github/rtl8192eu-linux-driver
1
0
Fork 0
mirror of https://github.com/Mange/rtl8192eu-linux-driver synced 2024-11-22 13:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace custom hwaddr_aton_i() with mac_pton()

Browse Source 
Replace custom hwaddr_aton_i() with mac_pton() in core/ioctl_linux.c
and remove the now unused function hwaddr_aton_i().

Link: https://lore.kernel.org/r/20210812132057.22579-1-straube.linux@gmail.com
This commit is contained in:
Michael Straube 2021-08-12 15:20:57 +02:00 committed by Carlos Garcés
parent 0faae6386e
commit c8fd0937e4
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
os_dep/linux/ioctl_linux.c
View File

@ -69,33 +69,6 @@ static const char *const iw_operation_mode[] = {
"Auto", "Ad-Hoc", "Managed", "Master", "Repeater", "Secondary", "Monitor" "Auto", "Ad-Hoc", "Managed", "Master", "Repeater", "Secondary", "Monitor"
}; };
/**
* hwaddr_aton - Convert ASCII string to MAC address
* @txt: MAC address as a string (e.g., "00:11:22:33:44:55")
* @addr: Buffer for the MAC address (ETH_ALEN = 6 bytes)
* Returns: 0 on success, -1 on failure (e.g., string not a MAC address)
*/
static int hwaddr_aton_i(const char *txt, u8 *addr)
{
int i;
for (i = 0; i < 6; i++) {
int a, b;
a = hex2num_i(*txt++);
if (a < 0)
return -1;
b = hex2num_i(*txt++);
if (b < 0)
return -1;
*addr++ = (a << 4) | b;
if (i < 5 && *txt++ != ':')
return -1;
}
return 0;
}
static void indicate_wx_custom_event(_adapter *padapter, char *msg) static void indicate_wx_custom_event(_adapter *padapter, char *msg)
{ {
u8 *buff; u8 *buff;
@ -3757,8 +3730,7 @@ static int rtw_get_ap_info(struct net_device *dev,
pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list);
/* if(hwaddr_aton_i(pdata->pointer, bssid)) */ if (!mac_pton(data, bssid)) {
if (hwaddr_aton_i(data, bssid)) {
RTW_INFO("Invalid BSSID '%s'.\n", (u8 *)data); RTW_INFO("Invalid BSSID '%s'.\n", (u8 *)data);
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
return -EINVAL; return -EINVAL;