diff options
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index e3fba6f09455..db96adf90ae2 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -771,10 +771,10 @@ static int zd1211b_hw_init_hmac(struct zd_chip *chip) | |||
771 | { | 771 | { |
772 | static const struct zd_ioreq32 ioreqs[] = { | 772 | static const struct zd_ioreq32 ioreqs[] = { |
773 | { CR_ZD1211B_RETRY_MAX, 0x02020202 }, | 773 | { CR_ZD1211B_RETRY_MAX, 0x02020202 }, |
774 | { CR_ZD1211B_TX_PWR_CTL4, 0x007f003f }, | 774 | { CR_ZD1211B_CWIN_MAX_MIN_AC0, 0x007f003f }, |
775 | { CR_ZD1211B_TX_PWR_CTL3, 0x007f003f }, | 775 | { CR_ZD1211B_CWIN_MAX_MIN_AC1, 0x007f003f }, |
776 | { CR_ZD1211B_TX_PWR_CTL2, 0x003f001f }, | 776 | { CR_ZD1211B_CWIN_MAX_MIN_AC2, 0x003f001f }, |
777 | { CR_ZD1211B_TX_PWR_CTL1, 0x001f000f }, | 777 | { CR_ZD1211B_CWIN_MAX_MIN_AC3, 0x001f000f }, |
778 | { CR_ZD1211B_AIFS_CTL1, 0x00280028 }, | 778 | { CR_ZD1211B_AIFS_CTL1, 0x00280028 }, |
779 | { CR_ZD1211B_AIFS_CTL2, 0x008C003C }, | 779 | { CR_ZD1211B_AIFS_CTL2, 0x008C003C }, |
780 | { CR_ZD1211B_TXOP, 0x01800824 }, | 780 | { CR_ZD1211B_TXOP, 0x01800824 }, |
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h index 009c03777a35..5b6e3a3751ba 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.h +++ b/drivers/net/wireless/zd1211rw/zd_chip.h | |||
@@ -625,11 +625,10 @@ enum { | |||
625 | #define CR_S_MD CTL_REG(0x0830) | 625 | #define CR_S_MD CTL_REG(0x0830) |
626 | 626 | ||
627 | #define CR_USB_DEBUG_PORT CTL_REG(0x0888) | 627 | #define CR_USB_DEBUG_PORT CTL_REG(0x0888) |
628 | 628 | #define CR_ZD1211B_CWIN_MAX_MIN_AC0 CTL_REG(0x0b00) | |
629 | #define CR_ZD1211B_TX_PWR_CTL1 CTL_REG(0x0b00) | 629 | #define CR_ZD1211B_CWIN_MAX_MIN_AC1 CTL_REG(0x0b04) |
630 | #define CR_ZD1211B_TX_PWR_CTL2 CTL_REG(0x0b04) | 630 | #define CR_ZD1211B_CWIN_MAX_MIN_AC2 CTL_REG(0x0b08) |
631 | #define CR_ZD1211B_TX_PWR_CTL3 CTL_REG(0x0b08) | 631 | #define CR_ZD1211B_CWIN_MAX_MIN_AC3 CTL_REG(0x0b0c) |
632 | #define CR_ZD1211B_TX_PWR_CTL4 CTL_REG(0x0b0c) | ||
633 | #define CR_ZD1211B_AIFS_CTL1 CTL_REG(0x0b10) | 632 | #define CR_ZD1211B_AIFS_CTL1 CTL_REG(0x0b10) |
634 | #define CR_ZD1211B_AIFS_CTL2 CTL_REG(0x0b14) | 633 | #define CR_ZD1211B_AIFS_CTL2 CTL_REG(0x0b14) |
635 | #define CR_ZD1211B_TXOP CTL_REG(0x0b20) | 634 | #define CR_ZD1211B_TXOP CTL_REG(0x0b20) |