From 465dbd55617c09f47496fdbf27a16973e5787860 Mon Sep 17 00:00:00 2001
From: James K Lewis <jklewis@us.ibm.com>
Date: Fri, 17 Nov 2006 14:39:36 -0800
Subject: [PATCH] --- yaml --- r: 41426 b: refs/heads/master c:
 9c434f5e2181097e1d22d9b3e381ca6d693e5188 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/spider_net.c | 18 +++++-------------
 trunk/drivers/net/spider_net.h |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 766981998898..041d861e7c2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 418e8f3d7ef4a30d4b5c84440641c9792a7f83f1
+refs/heads/master: 9c434f5e2181097e1d22d9b3e381ca6d693e5188
diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c
index 418138dd6c68..9dd282346e1c 100644
--- a/trunk/drivers/net/spider_net.c
+++ b/trunk/drivers/net/spider_net.c
@@ -644,20 +644,12 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
 	struct spider_net_descr *descr;
 	dma_addr_t buf;
 	unsigned long flags;
-	int length;
 
-	length = skb->len;
-	if (length < ETH_ZLEN) {
-		if (skb_pad(skb, ETH_ZLEN-length))
-			return 0;
-		length = ETH_ZLEN;
-	}
-
-	buf = pci_map_single(card->pdev, skb->data, length, PCI_DMA_TODEVICE);
+	buf = pci_map_single(card->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
 	if (pci_dma_mapping_error(buf)) {
 		if (netif_msg_tx_err(card) && net_ratelimit())
 			pr_err("could not iommu-map packet (%p, %i). "
-				  "Dropping packet\n", skb->data, length);
+				  "Dropping packet\n", skb->data, skb->len);
 		card->spider_stats.tx_iommu_map_error++;
 		return -ENOMEM;
 	}
@@ -667,7 +659,7 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
 	card->tx_chain.head = descr->next;
 
 	descr->buf_addr = buf;
-	descr->buf_size = length;
+	descr->buf_size = skb->len;
 	descr->next_descr_addr = 0;
 	descr->skb = skb;
 	descr->data_status = 0;
@@ -802,8 +794,8 @@ spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
 
 		/* unmap the skb */
 		if (skb) {
-			int len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
-			pci_unmap_single(card->pdev, buf_addr, len, PCI_DMA_TODEVICE);
+			pci_unmap_single(card->pdev, buf_addr, skb->len,
+					PCI_DMA_TODEVICE);
 			dev_kfree_skb(skb);
 		}
 	}
diff --git a/trunk/drivers/net/spider_net.h b/trunk/drivers/net/spider_net.h
index b3b46119b424..cb85cbb3d92d 100644
--- a/trunk/drivers/net/spider_net.h
+++ b/trunk/drivers/net/spider_net.h
@@ -24,7 +24,7 @@
 #ifndef _SPIDER_NET_H
 #define _SPIDER_NET_H
 
-#define VERSION "1.1 A"
+#define VERSION "1.5 A"
 
 #include "sungem_phy.h"