net/wireless: ipw2200: change interface name to wlan0

Fix net/wireless/Kconfig as well.

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 67cad9b..ffee073 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -89,6 +89,7 @@ MODULE_FIRMWARE("ipw2200-ibss.fw");
 MODULE_FIRMWARE("ipw2200-sniffer.fw");
 #endif
 MODULE_FIRMWARE("ipw2200-bss.fw");
+MODULE_ALIAS_NETDEV("wlan0");
 
 static int cmdlog = 0;
 static int debug = 0;
@@ -11639,7 +11640,7 @@ static int ipw_pci_probe(struct pci_dev *pdev,
                err = -ENOMEM;
                goto out;
        }
-
+       strcpy(net_dev->name, "wlan%d");
        priv = libipw_priv(net_dev);
        priv->ieee = netdev_priv(net_dev);
 

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 29c8675..4feb14e 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,5 +1,5 @@
 config WIRELESS_EXT
-       bool
+       bool "WEXT"
 
 config WEXT_CORE
        def_bool y
@@ -11,10 +11,10 @@ config WEXT_PROC
        depends on WEXT_CORE
 
 config WEXT_SPY
-       bool
+       bool "WEXT_SPY"
 
 config WEXT_PRIV
-       bool
+       bool "WEXT_PRIV"
 
 config CFG80211
        tristate "cfg80211 - wireless configuration API"
@@ -183,7 +183,7 @@ config CFG80211_WEXT
          extensions with cfg80211-based drivers.
 
 config LIB80211
-       tristate
+       tristate "LIB80211"
        default n
        help
          This options enables a library of common routines used
@@ -192,13 +192,13 @@ config LIB80211
          Drivers should select this themselves if needed.
 
 config LIB80211_CRYPT_WEP
-       tristate
+       tristate "LIB80211_CRYPT_WEP"
 
 config LIB80211_CRYPT_CCMP
-       tristate
+       tristate "LIB80211_CRYPT_CCMP"
 
 config LIB80211_CRYPT_TKIP
-       tristate
+       tristate "LIB80211_CRYPT_TKIP"
 
 config LIB80211_DEBUG
        bool "lib80211 debugging messages"