aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti/wl18xx/main.c
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2012-06-04 17:02:25 -0400
committerLuciano Coelho <coelho@ti.com>2012-06-05 09:07:16 -0400
commitb5d6d9b28ca1fac178e05f185ee38e9c0770e268 (patch)
tree32b41a3b7d44344c0253453e912e55db3a416f81 /drivers/net/wireless/ti/wl18xx/main.c
parent3d62eb5a7eb8d0be68442e119583508926731887 (diff)
wlcore/wl12xx/wl18xx: don't use TX align quirk for wl127x
Commit 4afc37 (wlcore: reorder identify_chip and get_hw_info) broke support for wl127x chips. When we moved the identify_chip operation to an earlier stage (ie. to the probe function), we broke wl127x support because during HW init we would set the WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN. To avoid this, set this quirk in the identify_chip operations and only force it to be unset if the bus module doesn't support it. We were doing the opposite and setting the flag if the bus module supports it. Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx/main.c')
-rw-r--r--drivers/net/wireless/ti/wl18xx/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index dda9c18e5506..2e9b3cb6e074 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -591,8 +591,9 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
591 /* wl18xx uses the same firmware for PLT */ 591 /* wl18xx uses the same firmware for PLT */
592 wl->plt_fw_name = WL18XX_FW_NAME; 592 wl->plt_fw_name = WL18XX_FW_NAME;
593 wl->quirks |= WLCORE_QUIRK_NO_ELP | 593 wl->quirks |= WLCORE_QUIRK_NO_ELP |
594 WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED | 594 WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED |
595 WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN; 595 WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN |
596 WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
596 597
597 /* PG 1.0 has some problems with MCS_13, so disable it */ 598 /* PG 1.0 has some problems with MCS_13, so disable it */
598 wl->ht_cap.mcs.rx_mask[1] &= ~BIT(5); 599 wl->ht_cap.mcs.rx_mask[1] &= ~BIT(5);