Messages in this thread | | | Date | Tue, 27 Nov 2012 11:47:51 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the infiniband tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/mellanox/mlx4/en_rx.c between commit 08ff32352d6f ("mlx4: 64-byte CQE/EQE support") from the infiniband tree and commit f1d29a3fa68b ("mlx4_en: Remove remnants of LRO support") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/mellanox/mlx4/en_rx.c index 6fa106f,f76c967..0000000 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@@ -710,12 -709,9 +710,9 @@@ next ++cq->mcq.cons_index; index = (cq->mcq.cons_index) & ring->size_mask; - cqe = &cq->buf[index]; + cqe = &cq->buf[(index << factor) + factor]; - if (++polled == budget) { - /* We are here because we reached the NAPI budget - - * flush only pending LRO sessions */ + if (++polled == budget) goto out; - } } out: [unhandled content-type:application/pgp-signature] | |