diff options
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/ipw2x00/Kconfig index a8131384c6b..2715b101ade 100644 --- a/drivers/net/wireless/ipw2x00/Kconfig +++ b/drivers/net/wireless/ipw2x00/Kconfig | |||
| @@ -4,8 +4,10 @@ | |||
| 4 | 4 | ||
| 5 | config IPW2100 | 5 | config IPW2100 |
| 6 | tristate "Intel PRO/Wireless 2100 Network Connection" | 6 | tristate "Intel PRO/Wireless 2100 Network Connection" |
| 7 | depends on PCI && WLAN_80211 && CFG80211 | 7 | depends on PCI && CFG80211 |
| 8 | select WIRELESS_EXT | 8 | select WIRELESS_EXT |
| 9 | select WEXT_SPY | ||
| 10 | select WEXT_PRIV | ||
| 9 | select FW_LOADER | 11 | select FW_LOADER |
| 10 | select LIB80211 | 12 | select LIB80211 |
| 11 | select LIBIPW | 13 | select LIBIPW |
| @@ -63,8 +65,10 @@ config IPW2100_DEBUG | |||
| 63 | 65 | ||
| 64 | config IPW2200 | 66 | config IPW2200 |
| 65 | tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" | 67 | tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" |
| 66 | depends on PCI && WLAN_80211 && CFG80211 | 68 | depends on PCI && CFG80211 && CFG80211_WEXT |
| 67 | select WIRELESS_EXT | 69 | select WIRELESS_EXT |
| 70 | select WEXT_SPY | ||
| 71 | select WEXT_PRIV | ||
| 68 | select FW_LOADER | 72 | select FW_LOADER |
| 69 | select LIB80211 | 73 | select LIB80211 |
| 70 | select LIBIPW | 74 | select LIBIPW |
| @@ -150,8 +154,9 @@ config IPW2200_DEBUG | |||
| 150 | 154 | ||
| 151 | config LIBIPW | 155 | config LIBIPW |
| 152 | tristate | 156 | tristate |
| 153 | depends on PCI && WLAN_80211 && CFG80211 | 157 | depends on PCI && CFG80211 |
| 154 | select WIRELESS_EXT | 158 | select WIRELESS_EXT |
| 159 | select WEXT_SPY | ||
| 155 | select CRYPTO | 160 | select CRYPTO |
| 156 | select CRYPTO_ARC4 | 161 | select CRYPTO_ARC4 |
| 157 | select CRYPTO_ECB | 162 | select CRYPTO_ECB |
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 0d30a9e2d3d..5c6ff58732d 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
| @@ -11274,6 +11274,7 @@ static int ipw_up(struct ipw_priv *priv) | |||
| 11274 | if (!(priv->config & CFG_CUSTOM_MAC)) | 11274 | if (!(priv->config & CFG_CUSTOM_MAC)) |
| 11275 | eeprom_parse_mac(priv, priv->mac_addr); | 11275 | eeprom_parse_mac(priv, priv->mac_addr); |
| 11276 | memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN); | 11276 | memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN); |
| 11277 | memcpy(priv->net_dev->perm_addr, priv->mac_addr, ETH_ALEN); | ||
| 11277 | 11278 | ||
| 11278 | for (j = 0; j < ARRAY_SIZE(ipw_geos); j++) { | 11279 | for (j = 0; j < ARRAY_SIZE(ipw_geos); j++) { |
| 11279 | if (!memcmp(&priv->eeprom[EEPROM_COUNTRY_CODE], | 11280 | if (!memcmp(&priv->eeprom[EEPROM_COUNTRY_CODE], |