From 363c1665c9730ae17ccc66b9455555519797b709 Mon Sep 17 00:00:00 2001 From: Frank Blaschka Date: Tue, 1 Apr 2008 10:26:59 +0200 Subject: [PATCH] --- yaml --- r: 90877 b: refs/heads/master c: b403e685b7c57f7912bae36987433e72c616f418 h: refs/heads/master i: 90875: 31a8e335390f394fac7f246cf0e4149f8e9b9d7a v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_core_main.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6dfb4740476d..9b22f030bcd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d11ba0c40fa8a21511822efee3be8389f94f0431 +refs/heads/master: b403e685b7c57f7912bae36987433e72c616f418 diff --git a/trunk/drivers/s390/net/qeth_core_main.c b/trunk/drivers/s390/net/qeth_core_main.c index 5cfe0ef7719a..055f5c3e7b56 100644 --- a/trunk/drivers/s390/net/qeth_core_main.c +++ b/trunk/drivers/s390/net/qeth_core_main.c @@ -4002,7 +4002,11 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, } } 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)