rt2870sta interface names

Mike Galbraith efault at gmx.de
Fri Jul 31 05:52:58 UTC 2009


Dunno if this is acceptable.  I'm running with the below, or variations
thereof, for all kernels with rtxxxxsta configured due to Yast having an
attitude problem with "ra" as an interface name, and me not knowing
where yast stores it's attitude.  This one is against .git.
 
Staging: rt2870: Rename devices ra->wlan

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 at gmx.de>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/rt2860/rt_linux.c    |    2 +-
 drivers/staging/rt2860/rt_main_dev.c |    4 ++--
 drivers/staging/rt2860/rt_profile.c  |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6.31.git/drivers/staging/rt2860/rt_main_dev.c
===================================================================
--- linux-2.6.31.git.orig/drivers/staging/rt2860/rt_main_dev.c
+++ linux-2.6.31.git/drivers/staging/rt2860/rt_main_dev.c
@@ -710,7 +710,7 @@ static NDIS_STATUS rt_ieee80211_if_setup
 	// 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
 	}
 	else
 	{
-		sprintf(dev->name, "ra%d", i);
+		sprintf(dev->name, "wlan%d", i);
 		Status = NDIS_STATUS_SUCCESS;
 	}
 
Index: linux-2.6.31.git/drivers/staging/rt2860/rt_linux.c
===================================================================
--- linux-2.6.31.git.orig/drivers/staging/rt2860/rt_linux.c
+++ linux-2.6.31.git/drivers/staging/rt2860/rt_linux.c
@@ -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) ");
 
Index: linux-2.6.31.git/drivers/staging/rt2860/rt_profile.c
===================================================================
--- linux-2.6.31.git.orig/drivers/staging/rt2860/rt_profile.c
+++ linux-2.6.31.git/drivers/staging/rt2860/rt_profile.c
@@ -710,7 +710,7 @@ static int rtmp_parse_key_buffer_from_fi
 				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_fi
 				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;
 		}
 	}





More information about the devel mailing list