diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-10 17:12:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-10 17:12:17 +1100 |
| commit | 530220682edacd1ddcfbdf29f51c856335f50703 (patch) | |
| tree | 379200a700ae05235e0ed6995254430fb8db76f9 /drivers/staging/otus/80211core/ccmd.c | |
| parent | cc4c54e4beddf383845c6074d303eea89859a4ba (diff) | |
| parent | e0b0f9ac76a0d60439718dffac92ec5d3d1f000b (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
drivers/staging/vt6655/Kconfig
drivers/staging/vt6656/Kconfig
Diffstat (limited to 'drivers/staging/otus/80211core/ccmd.c')
| -rw-r--r-- | drivers/staging/otus/80211core/ccmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/otus/80211core/ccmd.c b/drivers/staging/otus/80211core/ccmd.c index 83dd8ba1328c..8da28eee7fb0 100644 --- a/drivers/staging/otus/80211core/ccmd.c +++ b/drivers/staging/otus/80211core/ccmd.c @@ -899,7 +899,7 @@ u16_t zfiWlanDisable(zdev_t *dev, u8_t ResetKeyCache) zfStaDisableSWEncryption(dev); } - /* Improve WEP/TKIP performace with HT AP, + /* Improve WEP/TKIP performance with HT AP, detail information please look bug#32495 */ /* zfHpSetTTSIFSTime(dev, 0x8); */ @@ -1407,7 +1407,7 @@ u16_t zfWlanReset(zdev_t *dev) zfStaDisableSWEncryption(dev); } - /* Improve WEP/TKIP performace with HT AP, + /* Improve WEP/TKIP performance with HT AP, detail information please look bug#32495 */ /* zfHpSetTTSIFSTime(dev, 0x8); */ |