[patch 7/8] qeth: core code should alloc headroom for LLC protocol

[frank.blaschka@de.ibm.com]

[-- Attachment #1: 07-qeth_headroom.patch --]
[-- Type: text/plain, Size: 1007 bytes --]

From: Frank Blaschka <frank.blaschka@de.ibm.com>

Allocate headroom for TR_HLEN but using only ETH_HLEN causes rx
performance degradation. Allocate ETH_HLEN for ethernet and
TR_HLEN for token ring (layer 3 mode).

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
 drivers/s390/net/qeth_core_main.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: git_davem-2.6.26/drivers/s390/net/qeth_core_main.c
===================================================================
--- git_davem-2.6.26.orig/drivers/s390/net/qeth_core_main.c	2008-03-31 13:21:07.000000000 +0200
+++ git_davem-2.6.26/drivers/s390/net/qeth_core_main.c	2008-03-31 13:21:36.000000000 +0200
@@ -4002,7 +4002,11 @@
 		}
 	} else {
 		skb_len = (*hdr)->hdr.l3.length;
-		headroom = max((int)ETH_HLEN, (int)TR_HLEN);
+		if ((card->info.link_type == QETH_LINK_TYPE_LANE_TR) ||
+		    (card->info.link_type == QETH_LINK_TYPE_HSTR))
+			headroom = TR_HLEN;
+		else
+			headroom = ETH_HLEN;
 	}
 
 	if (!skb_len)

--