diff options
author | James Ketrenos <jketreno@linux.intel.com> | 2005-09-14 15:28:59 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-16 03:15:57 -0400 |
commit | a33a1982012e9070736e3717231714dc9892303b (patch) | |
tree | 83ff248e8019cd6036f01db43a9627da1b703bae | |
parent | 3bc5ed684253f407b1567799d13cb06a0d86fe80 (diff) |
[PATCH] Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change
author James Ketrenos <jketreno@linux.intel.com> 1126713327 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1126713327 -0500
Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index b7f275c00de3..86feef732dbb 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -6010,12 +6010,12 @@ static int ipw_wx_set_wireless_mode(struct net_device *dev, | |||
6010 | } | 6010 | } |
6011 | 6011 | ||
6012 | if (priv->adapter == IPW_2915ABG) { | 6012 | if (priv->adapter == IPW_2915ABG) { |
6013 | priv->ieee->abg_ture = 1; | 6013 | priv->ieee->abg_true = 1; |
6014 | if (mode & IEEE_A) { | 6014 | if (mode & IEEE_A) { |
6015 | band |= IEEE80211_52GHZ_BAND; | 6015 | band |= IEEE80211_52GHZ_BAND; |
6016 | modulation |= IEEE80211_OFDM_MODULATION; | 6016 | modulation |= IEEE80211_OFDM_MODULATION; |
6017 | } else | 6017 | } else |
6018 | priv->ieee->abg_ture = 0; | 6018 | priv->ieee->abg_true = 0; |
6019 | } else { | 6019 | } else { |
6020 | if (mode & IEEE_A) { | 6020 | if (mode & IEEE_A) { |
6021 | IPW_WARNING("Attempt to set 2200BG into " | 6021 | IPW_WARNING("Attempt to set 2200BG into " |
@@ -6023,20 +6023,20 @@ static int ipw_wx_set_wireless_mode(struct net_device *dev, | |||
6023 | return -EINVAL; | 6023 | return -EINVAL; |
6024 | } | 6024 | } |
6025 | 6025 | ||
6026 | priv->ieee->abg_ture = 0; | 6026 | priv->ieee->abg_true = 0; |
6027 | } | 6027 | } |
6028 | 6028 | ||
6029 | if (mode & IEEE_B) { | 6029 | if (mode & IEEE_B) { |
6030 | band |= IEEE80211_24GHZ_BAND; | 6030 | band |= IEEE80211_24GHZ_BAND; |
6031 | modulation |= IEEE80211_CCK_MODULATION; | 6031 | modulation |= IEEE80211_CCK_MODULATION; |
6032 | } else | 6032 | } else |
6033 | priv->ieee->abg_ture = 0; | 6033 | priv->ieee->abg_true = 0; |
6034 | 6034 | ||
6035 | if (mode & IEEE_G) { | 6035 | if (mode & IEEE_G) { |
6036 | band |= IEEE80211_24GHZ_BAND; | 6036 | band |= IEEE80211_24GHZ_BAND; |
6037 | modulation |= IEEE80211_OFDM_MODULATION; | 6037 | modulation |= IEEE80211_OFDM_MODULATION; |
6038 | } else | 6038 | } else |
6039 | priv->ieee->abg_ture = 0; | 6039 | priv->ieee->abg_true = 0; |
6040 | 6040 | ||
6041 | priv->ieee->mode = mode; | 6041 | priv->ieee->mode = mode; |
6042 | priv->ieee->freq_band = band; | 6042 | priv->ieee->freq_band = band; |
@@ -7108,7 +7108,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
7108 | printk(KERN_INFO DRV_NAME | 7108 | printk(KERN_INFO DRV_NAME |
7109 | ": Detected Intel PRO/Wireless 2915ABG Network " | 7109 | ": Detected Intel PRO/Wireless 2915ABG Network " |
7110 | "Connection\n"); | 7110 | "Connection\n"); |
7111 | priv->ieee->abg_ture = 1; | 7111 | priv->ieee->abg_true = 1; |
7112 | band = IEEE80211_52GHZ_BAND | IEEE80211_24GHZ_BAND; | 7112 | band = IEEE80211_52GHZ_BAND | IEEE80211_24GHZ_BAND; |
7113 | modulation = IEEE80211_OFDM_MODULATION | | 7113 | modulation = IEEE80211_OFDM_MODULATION | |
7114 | IEEE80211_CCK_MODULATION; | 7114 | IEEE80211_CCK_MODULATION; |
@@ -7124,7 +7124,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
7124 | ": Detected Intel PRO/Wireless 2200BG Network " | 7124 | ": Detected Intel PRO/Wireless 2200BG Network " |
7125 | "Connection\n"); | 7125 | "Connection\n"); |
7126 | 7126 | ||
7127 | priv->ieee->abg_ture = 0; | 7127 | priv->ieee->abg_true = 0; |
7128 | band = IEEE80211_24GHZ_BAND; | 7128 | band = IEEE80211_24GHZ_BAND; |
7129 | modulation = IEEE80211_OFDM_MODULATION | | 7129 | modulation = IEEE80211_OFDM_MODULATION | |
7130 | IEEE80211_CCK_MODULATION; | 7130 | IEEE80211_CCK_MODULATION; |