mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 23:24:50 +00:00
Staging: rt2870sta interface names
The rest of the known universe prefers wlanN for wireless interface names, to the point that some distro configuration tools, such as opensuse's Yast, don't even allow the user to enter a name, and simply pre-select "wlan". Signed-off-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
d0e0507ad6
commit
7d5efd6199
3 changed files with 6 additions and 6 deletions
|
@ -776,7 +776,7 @@ VOID RTMPSendWirelessEvent(
|
|||
if (pAddr)
|
||||
pBufPtr += sprintf(pBufPtr, "(RT2860) STA(%02x:%02x:%02x:%02x:%02x:%02x) ", PRINT_MAC(pAddr));
|
||||
else if (BssIdx < MAX_MBSSID_NUM)
|
||||
pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(ra%d) ", BssIdx);
|
||||
pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx);
|
||||
else
|
||||
pBufPtr += sprintf(pBufPtr, "(RT2860) ");
|
||||
|
||||
|
|
|
@ -710,7 +710,7 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
|
|||
// find available device name
|
||||
for (i = 0; i < 8; i++)
|
||||
{
|
||||
sprintf(slot_name, "ra%d", i);
|
||||
sprintf(slot_name, "wlan%d", i);
|
||||
|
||||
device = dev_get_by_name(dev_net(dev), slot_name);
|
||||
if (device != NULL)
|
||||
|
@ -727,7 +727,7 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
|
|||
}
|
||||
else
|
||||
{
|
||||
sprintf(dev->name, "ra%d", i);
|
||||
sprintf(dev->name, "wlan%d", i);
|
||||
Status = NDIS_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
|
@ -710,7 +710,7 @@ static int rtmp_parse_key_buffer_from_file(IN PRTMP_ADAPTER pAd,IN char *buffe
|
|||
CipherAlg = CIPHER_WEP128;
|
||||
pAd->SharedKey[i][idx].CipherAlg = CipherAlg;
|
||||
|
||||
DBGPRINT(RT_DEBUG_TRACE, ("I/F(ra%d) Key%dStr=%s and type=%s\n", i, idx+1, keybuff, (KeyType == 0) ? "Hex":"Ascii"));
|
||||
DBGPRINT(RT_DEBUG_TRACE, ("I/F(wlan%d) Key%dStr=%s and type=%s\n", i, idx+1, keybuff, (KeyType == 0) ? "Hex":"Ascii"));
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
@ -731,12 +731,12 @@ static int rtmp_parse_key_buffer_from_file(IN PRTMP_ADAPTER pAd,IN char *buffe
|
|||
CipherAlg = CIPHER_WEP128;
|
||||
pAd->SharedKey[i][idx].CipherAlg = CipherAlg;
|
||||
|
||||
DBGPRINT(RT_DEBUG_TRACE, ("I/F(ra%d) Key%dStr=%s and type=%s\n", i, idx+1, keybuff, (KeyType == 0) ? "Hex":"Ascii"));
|
||||
DBGPRINT(RT_DEBUG_TRACE, ("I/F(wlan%d) Key%dStr=%s and type=%s\n", i, idx+1, keybuff, (KeyType == 0) ? "Hex":"Ascii"));
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{//Invalid key length
|
||||
DBGPRINT(RT_DEBUG_ERROR, ("I/F(ra%d) Key%dStr is Invalid key length! KeyLen = %ld!\n", i, idx+1, KeyLen));
|
||||
DBGPRINT(RT_DEBUG_ERROR, ("I/F(wlan%d) Key%dStr is Invalid key length! KeyLen = %ld!\n", i, idx+1, KeyLen));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue