diff options
author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-01 12:01:17 +0000 |
---|---|---|
committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-01 12:01:17 +0000 |
commit | d8f56a6f5b70c6d42d97990776d14e63a40ac397 (patch) | |
tree | 6d4bfc88968cf690fefae77f2f6d9da98f650bac /sys/dev/pci/if_iwnreg.h | |
parent | 836504a9c5e807118a2139535b9695c9279d5cee (diff) |
- fix rx chain mask in scan command
- no Tx IQ calibration for 6000 series
- remove a comment about iwlwifi that is no longer true
Diffstat (limited to 'sys/dev/pci/if_iwnreg.h')
-rw-r--r-- | sys/dev/pci/if_iwnreg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_iwnreg.h b/sys/dev/pci/if_iwnreg.h index 5d7362ce445..c8c93660f12 100644 --- a/sys/dev/pci/if_iwnreg.h +++ b/sys/dev/pci/if_iwnreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwnreg.h,v 1.31 2009/10/28 18:42:47 damien Exp $ */ +/* $OpenBSD: if_iwnreg.h,v 1.32 2009/11/01 12:01:16 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -461,10 +461,10 @@ struct iwn_rxon { uint8_t air; uint16_t rxchain; -#define IWN_RXCHAIN_FORCE (1 << 0) -#define IWN_RXCHAIN_VALID(x) ((x) << 1) -#define IWN_RXCHAIN_SEL(x) ((x) << 4) -#define IWN_RXCHAIN_MIMO(x) ((x) << 7) +#define IWN_RXCHAIN_DRIVER_FORCE (1 << 0) +#define IWN_RXCHAIN_VALID(x) (((x) & IWN_ANT_ABC) << 1) +#define IWN_RXCHAIN_FORCE_SEL(x) (((x) & IWN_ANT_ABC) << 4) +#define IWN_RXCHAIN_FORCE_MIMO_SEL(x) (((x) & IWN_ANT_ABC) << 7) #define IWN_RXCHAIN_IDLE_COUNT(x) ((x) << 10) #define IWN_RXCHAIN_MIMO_COUNT(x) ((x) << 12) #define IWN_RXCHAIN_MIMO_FORCE (1 << 14) |