aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYevgeny Petrilin <yevgenyp@mellanox.co.il>2009-06-20 18:16:02 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-21 22:18:06 -0400
commit7237b400554c9bb5ba0091b5e39f4620f3dd5637 (patch)
treef04e7d47c85b1a959995b3515115b11b717c5285
parent3c05f5ef7c09291e51ae327e854bf43cb8e55a55 (diff)
mlx4_en: Removed redundant check on lso header size
This check that verifies that the LSO header along with control segment and first data segment do not cross 128 bytes is no longer required. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/mlx4/en_tx.c5
-rw-r--r--drivers/net/mlx4/mlx4_en.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 99a6a36dc27b..08c43f2ae72b 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -518,11 +518,6 @@ static int get_real_size(struct sk_buff *skb, struct net_device *dev,
518 return 0; 518 return 0;
519 } 519 }
520 } 520 }
521 if (unlikely(*lso_header_size > MAX_LSO_HDR_SIZE)) {
522 if (netif_msg_tx_err(priv))
523 en_warn(priv, "LSO header size too big\n");
524 return 0;
525 }
526 } else { 521 } else {
527 *lso_header_size = 0; 522 *lso_header_size = 0;
528 if (!is_inline(skb, NULL)) 523 if (!is_inline(skb, NULL))
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index d43a9e4c2aea..ad861db66f19 100644
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -99,7 +99,6 @@
99#define RSS_FACTOR 2 99#define RSS_FACTOR 2
100#define TXBB_SIZE 64 100#define TXBB_SIZE 64
101#define HEADROOM (2048 / TXBB_SIZE + 1) 101#define HEADROOM (2048 / TXBB_SIZE + 1)
102#define MAX_LSO_HDR_SIZE 92
103#define STAMP_STRIDE 64 102#define STAMP_STRIDE 64
104#define STAMP_DWORDS (STAMP_STRIDE / 4) 103#define STAMP_DWORDS (STAMP_STRIDE / 4)
105#define STAMP_SHIFT 31 104#define STAMP_SHIFT 31