Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10231
b: refs/heads/master
c: a33a198
h: refs/heads/master
i:
  10229: 17af967
  10227: b6e9c35
  10223: 0ff12e9
v: v3
  • Loading branch information
James Ketrenos authored and Jeff Garzik committed Sep 16, 2005
1 parent 1b2a9e3 commit eb66162
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3bc5ed684253f407b1567799d13cb06a0d86fe80
refs/heads/master: a33a1982012e9070736e3717231714dc9892303b
14 changes: 7 additions & 7 deletions trunk/drivers/net/wireless/ipw2200.c
Original file line number Diff line number Diff line change
Expand Up @@ -6010,33 +6010,33 @@ static int ipw_wx_set_wireless_mode(struct net_device *dev,
}

if (priv->adapter == IPW_2915ABG) {
priv->ieee->abg_ture = 1;
priv->ieee->abg_true = 1;
if (mode & IEEE_A) {
band |= IEEE80211_52GHZ_BAND;
modulation |= IEEE80211_OFDM_MODULATION;
} else
priv->ieee->abg_ture = 0;
priv->ieee->abg_true = 0;
} else {
if (mode & IEEE_A) {
IPW_WARNING("Attempt to set 2200BG into "
"802.11a mode\n");
return -EINVAL;
}

priv->ieee->abg_ture = 0;
priv->ieee->abg_true = 0;
}

if (mode & IEEE_B) {
band |= IEEE80211_24GHZ_BAND;
modulation |= IEEE80211_CCK_MODULATION;
} else
priv->ieee->abg_ture = 0;
priv->ieee->abg_true = 0;

if (mode & IEEE_G) {
band |= IEEE80211_24GHZ_BAND;
modulation |= IEEE80211_OFDM_MODULATION;
} else
priv->ieee->abg_ture = 0;
priv->ieee->abg_true = 0;

priv->ieee->mode = mode;
priv->ieee->freq_band = band;
Expand Down Expand Up @@ -7108,7 +7108,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
printk(KERN_INFO DRV_NAME
": Detected Intel PRO/Wireless 2915ABG Network "
"Connection\n");
priv->ieee->abg_ture = 1;
priv->ieee->abg_true = 1;
band = IEEE80211_52GHZ_BAND | IEEE80211_24GHZ_BAND;
modulation = IEEE80211_OFDM_MODULATION |
IEEE80211_CCK_MODULATION;
Expand All @@ -7124,7 +7124,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
": Detected Intel PRO/Wireless 2200BG Network "
"Connection\n");

priv->ieee->abg_ture = 0;
priv->ieee->abg_true = 0;
band = IEEE80211_24GHZ_BAND;
modulation = IEEE80211_OFDM_MODULATION |
IEEE80211_CCK_MODULATION;
Expand Down

0 comments on commit eb66162

Please sign in to comment.