diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/net/cassini.h | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/net/cassini.h')
| -rw-r--r-- | drivers/net/cassini.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cassini.h b/drivers/net/cassini.h index faf4746a0f3e..b361424d5f57 100644 --- a/drivers/net/cassini.h +++ b/drivers/net/cassini.h | |||
| @@ -772,7 +772,7 @@ | |||
| 772 | #define RX_DEBUG_INTR_WRITE_PTR_MASK 0xC0000000 /* interrupt write pointer | 772 | #define RX_DEBUG_INTR_WRITE_PTR_MASK 0xC0000000 /* interrupt write pointer |
| 773 | of the interrupt queue */ | 773 | of the interrupt queue */ |
| 774 | 774 | ||
| 775 | /* flow control frames are emmitted using two PAUSE thresholds: | 775 | /* flow control frames are emitted using two PAUSE thresholds: |
| 776 | * XOFF PAUSE uses pause time value pre-programmed in the Send PAUSE MAC reg | 776 | * XOFF PAUSE uses pause time value pre-programmed in the Send PAUSE MAC reg |
| 777 | * XON PAUSE uses a pause time of 0. granularity of threshold is 64bytes. | 777 | * XON PAUSE uses a pause time of 0. granularity of threshold is 64bytes. |
| 778 | * PAUSE thresholds defined in terms of FIFO occupancy and may be translated | 778 | * PAUSE thresholds defined in terms of FIFO occupancy and may be translated |