From 6564ff0dc0b3cd11605be17d2cbcce090ff2d6e3 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 24 Aug 2010 15:06:27 -0700
Subject: [PATCH] --- yaml --- r: 213950 b: refs/heads/master c:
 4562487a00445eab96311365ba15c41dc4d043cd h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/mlx4/en_rx.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e6dffa86b928..d2fb84a0d93c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04714a16db6fd8d175050a01459fd16660fba18c
+refs/heads/master: 4562487a00445eab96311365ba15c41dc4d043cd
diff --git a/trunk/drivers/net/mlx4/en_rx.c b/trunk/drivers/net/mlx4/en_rx.c
index cb7ff00ce6de..c4aad7f2beb9 100644
--- a/trunk/drivers/net/mlx4/en_rx.c
+++ b/trunk/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: