diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-11-01 20:32:17 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-11-01 20:32:17 +0000 |
| commit | c75ea33d511c57743ac32feb6a12c47f27e75a74 (patch) | |
| tree | c40513ead183a77ce4d4e0508cf2297dabcfa4de /sys | |
| parent | ac5c5454618a7ab5f1328e958aad5c2b998b00eb (diff) | |
backout last "fix" because it breaks operation on some devices. even
if the fix looks right, it seems to expose another problem that i
haven't found yet.
figured out by Denis Doroshenko at gmail dot com
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/ar5210.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ar5211.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ar5212.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/ic/ar5210.c b/sys/dev/ic/ar5210.c index e38913e547e..7b4c393a87d 100644 --- a/sys/dev/ic/ar5210.c +++ b/sys/dev/ic/ar5210.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5210.c,v 1.40 2007/10/29 09:39:35 reyk Exp $ */ +/* $OpenBSD: ar5210.c,v 1.41 2007/11/01 20:32:16 reyk Exp $ */ /* * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -1083,7 +1083,9 @@ ar5k_ar5210_fill_tx_desc(struct ath_hal *hal, struct ath_desc *desc, if (segment_length & ~AR5K_AR5210_DESC_TX_CTL1_BUF_LEN) return (AH_FALSE); tx_desc->tx_control_1 = +#if 0 (tx_desc->tx_control_1 & ~AR5K_AR5210_DESC_TX_CTL1_BUF_LEN) | +#endif segment_length; if (first_segment != AH_TRUE) diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c index d9b2d5d7137..e50e595c800 100644 --- a/sys/dev/ic/ar5211.c +++ b/sys/dev/ic/ar5211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5211.c,v 1.35 2007/10/29 09:39:35 reyk Exp $ */ +/* $OpenBSD: ar5211.c,v 1.36 2007/11/01 20:32:16 reyk Exp $ */ /* * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -1195,7 +1195,9 @@ ar5k_ar5211_fill_tx_desc(struct ath_hal *hal, struct ath_desc *desc, if (segment_length & ~AR5K_AR5211_DESC_TX_CTL1_BUF_LEN) return (AH_FALSE); tx_desc->tx_control_1 = +#if 0 (tx_desc->tx_control_1 & ~AR5K_AR5211_DESC_TX_CTL1_BUF_LEN) | +#endif segment_length; if (first_segment != AH_TRUE) diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c index 95f28a36b2f..6a52bad746c 100644 --- a/sys/dev/ic/ar5212.c +++ b/sys/dev/ic/ar5212.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5212.c,v 1.41 2007/10/29 09:39:35 reyk Exp $ */ +/* $OpenBSD: ar5212.c,v 1.42 2007/11/01 20:32:16 reyk Exp $ */ /* * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -1376,7 +1376,9 @@ ar5k_ar5212_fill_tx_desc(struct ath_hal *hal, struct ath_desc *desc, if (segment_length & ~AR5K_AR5212_DESC_TX_CTL1_BUF_LEN) return (AH_FALSE); tx_desc->tx_control_1 = +#if 0 (tx_desc->tx_control_1 & ~AR5K_AR5212_DESC_TX_CTL1_BUF_LEN) | +#endif segment_length; if (first_segment != AH_TRUE) |