Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c434f5e authored by James K Lewis's avatar James K Lewis Committed by Jeff Garzik
Browse files

[PATCH] Spidernet: remove ETH_ZLEN check in earlier patch 



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: default avatarJames K Lewis <jklewis@us.ibm.com>
Cc: Stephen Hemminger <shemminger@osdl.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 418e8f3d

drivers/net/spider_net.c

+5 −13
Original line number Diff line number Diff line
@@ -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);

		}

	}

drivers/net/spider_net.h

+1 −1
Original line number Diff line number Diff line
@@ -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"