diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-09-06 17:51:44 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-06 17:51:44 +0000 |
| commit | 2da2317feda8c509299b6a890cdfbdf243c00436 (patch) | |
| tree | cc136f6973d47077dba6ef2c461ae6e3d0a22deb | |
| parent | 05dd36a9804e238f346c53130dec38b12bcf7894 (diff) | |
| download | master-31e0f0ae-2da2317feda8c509299b6a890cdfbdf243c00436.tar.gz master-31e0f0ae-2da2317feda8c509299b6a890cdfbdf243c00436.tar.bz2 master-31e0f0ae-2da2317feda8c509299b6a890cdfbdf243c00436.zip | |
ar71xx: fix off-by-one error in packet descriptor splitting (patch from #13072)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 42428
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index ed04033341..c04fb94b94 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -704,7 +704,12 @@ static int ag71xx_fill_dma_desc(struct ag71xx_ring *ring, u32 addr, int len) if (cur_len > split) { cur_len = split; - if (len < split + 4) + + /* + * TX will hang if DMA transfers <= 4 bytes, + * make sure next segment is more than 4 bytes long. + */ + if (len <= split + 4) cur_len -= 4; } |