diff options
| author | zf162725 <none@none> | 2007-05-11 03:41:48 -0700 |
|---|---|---|
| committer | zf162725 <none@none> | 2007-05-11 03:41:48 -0700 |
| commit | c1500db945971ce16b2509a64fc04cd590779a2e (patch) | |
| tree | 2a72eb0bb4ede0ef84900a476231599e14049525 /usr/src | |
| parent | 0eca9a2491ccacd1e43ae395f374369b5d7e3dbe (diff) | |
| download | illumos-gate-c1500db945971ce16b2509a64fc04cd590779a2e.tar.gz | |
6380004 ath RFE: support AR5211 on IBM ThinkPad T40 (pci168c,12)
6522758 Ath failed to connect to Belkin F5D7230-4 AP when it's set to G-Only mode
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/pkgdefs/SUNWatheros/postinstall | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ath/ath_main.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/io/net80211/net80211_output.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/pkgdefs/SUNWatheros/postinstall b/usr/src/pkgdefs/SUNWatheros/postinstall index 8b8085dead..df4be402a0 100644 --- a/usr/src/pkgdefs/SUNWatheros/postinstall +++ b/usr/src/pkgdefs/SUNWatheros/postinstall @@ -21,7 +21,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -29,7 +29,7 @@ # Driver info DRV=ath -DRVALIAS='"pci168c,13" "pci168c,1014" "pci168c,1a" "pci168c,1b"' +DRVALIAS='"pci168c,12" "pci168c,13" "pci168c,1014" "pci168c,1a" "pci168c,1b"' BASEDIR=${BASEDIR:-/} diff --git a/usr/src/uts/common/io/ath/ath_main.c b/usr/src/uts/common/io/ath/ath_main.c index 0e40660aa7..da6094891e 100644 --- a/usr/src/uts/common/io/ath/ath_main.c +++ b/usr/src/uts/common/io/ath/ath_main.c @@ -1975,7 +1975,8 @@ ath_attach(dev_info_t *devinfo, ddi_attach_cmd_t cmd) */ /* 11g support is identified when we fetch the channel set */ if (asc->asc_have11g) - ic->ic_caps |= IEEE80211_C_SHPREAMBLE; + ic->ic_caps |= IEEE80211_C_SHPREAMBLE | + IEEE80211_C_SHSLOT; /* short slot time */ /* * Query the hal to figure out h/w crypto support. */ diff --git a/usr/src/uts/common/io/net80211/net80211_output.c b/usr/src/uts/common/io/net80211/net80211_output.c index d32ab7f88b..22679221fa 100644 --- a/usr/src/uts/common/io/net80211/net80211_output.c +++ b/usr/src/uts/common/io/net80211/net80211_output.c @@ -528,6 +528,8 @@ ieee80211_send_mgmt(ieee80211com_t *ic, ieee80211_node_t *in, int type, int arg) if (!(in->in_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) || !(ic->ic_caps & IEEE80211_C_SHSLOT)) { capinfo &= ~IEEE80211_CAPINFO_SHORT_SLOTTIME; + } else { + capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; } *(uint16_t *)frm = LE_16(capinfo); frm += 2; |