From 6d52aea7860d24fe45114a386b92ff523194c919 Mon Sep 17 00:00:00 2001 From: Andy Cress Date: Thu, 26 Jul 2012 06:01:17 +0000 Subject: [PATCH] --- yaml --- r: 318931 b: refs/heads/master c: 4487e64de63b8e42efe5a5543871c42c5a5859d9 h: refs/heads/master i: 318929: 3e82817dd3eaa51205975f6d7d0d6c9e75cce885 318927: 0cbb4269043df395a6ef66097fd80bfc85d3f762 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index bbd6dae204fc..aed75dcee793 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2c31662762b9e82b9891d6b385b17f9e5ef0ed2 +refs/heads/master: 4487e64de63b8e42efe5a5543871c42c5a5859d9 diff --git a/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 1bb4cd14b149..feb85d56c750 100644 --- a/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -2159,13 +2159,6 @@ static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring; unsigned long flags; - if (unlikely(skb->len > (adapter->hw.mac.max_frame_size - 4))) { - pr_err("Transfer length Error: skb len: %d > max: %d\n", - skb->len, adapter->hw.mac.max_frame_size); - dev_kfree_skb_any(skb); - adapter->stats.tx_length_errors++; - return NETDEV_TX_OK; - } if (!spin_trylock_irqsave(&tx_ring->tx_lock, flags)) { /* Collision - tell upper layer to requeue */ return NETDEV_TX_LOCKED;