Re: [PATCH 01/14] mlx4_en: Fixed incorrect unmapping on RX flow.

[David Miller <davem@davemloft.net>]

All 14 patches applied, but patches #12 and #13 had a lot of conflicts
because the LRO options were already deleted by the patch I applied
last week from Amerigo Wang:

commit f3c58aceaa3f237ba43735805f4677950327b8ee
Author: Amerigo Wang <amwang@redhat.com>
Date:   Tue Aug 17 21:51:18 2010 +0000

    mlx4: remove num_lro parameter
    
    As suggested by David, this parameter can die, we can use ethtool
    to turn LRO on/off. Compile tests only.
    
    Signed-off-by: WANG Cong <amwang@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

I fixed up the conflicts but please generate your patches against
the correct tree in the future.

I also had to add the following build warning fix after applying your
patches, do you look at the build output at allwhen you make changes
to this driver?

--------------------
mlx4_en: Fix build warning in mlx4_en_create_rx_ring.

drivers/net/mlx4/en_rx.c: In function ‘mlx4_en_create_rx_ring’:
drivers/net/mlx4/en_rx.c:305: warning: label ‘err_map’ defined but not used

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/mlx4/en_rx.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index cb7ff00..c4aad7f 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -302,8 +302,6 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
 
 	return 0;
 
-err_map:
-	mlx4_en_unmap_buffer(&ring->wqres.buf);
 err_hwq:
 	mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
 err_ring:
-- 
1.7.2.2