The patch titled
Spidernet: remove ETH_ZLEN check in earlier patch
has been added to the -mm tree. Its filename is
spidernet-remove-eth_zlen-check-in-earlier-patch.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Spidernet: remove ETH_ZLEN check in earlier patch
From: James K Lewis <jklewis@xxxxxxxxxx>
In an earlier patch, code was added to pad packets that were less that
ETH_ZLEN (60) bytes using the skb_pad function. This has caused hangs when
accessing certain NFS mounted file systems. This patch removes the check
and solves the NFS problem. The driver, with this patch, has been tested
extensively. Please apply.
Signed-off-by: James K Lewis <jklewis@xxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxx>
Cc: Jeff Garzik <jgarzik@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/spider_net.c | 18 +++++-------------
drivers/net/spider_net.h | 2 +-
2 files changed, 6 insertions(+), 14 deletions(-)
diff -puN drivers/net/spider_net.c~spidernet-remove-eth_zlen-check-in-earlier-patch drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spidernet-remove-eth_zlen-check-in-earlier-patch
+++ a/drivers/net/spider_net.c
@@ -644,20 +644,12 @@ spider_net_prepare_tx_descr(struct spide
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 spide
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 spide
/* 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 -puN drivers/net/spider_net.h~spidernet-remove-eth_zlen-check-in-earlier-patch drivers/net/spider_net.h
--- a/drivers/net/spider_net.h~spidernet-remove-eth_zlen-check-in-earlier-patch
+++ a/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"
_
Patches currently in -mm which might be from jklewis@xxxxxxxxxx are
spidernet-remove-eth_zlen-check-in-earlier-patch.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
