From bd3e2c7bec823eb429ddf393e900c6f7a26594c3 Mon Sep 17 00:00:00 2001 From: Frank Pavlic Date: Wed, 20 Jun 2007 12:59:14 +0200 Subject: [PATCH] --- yaml --- r: 57918 b: refs/heads/master c: cd3e76ebcb41c48ef6e706006b793d45030bae75 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_eddp.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 78cbdd78a0a2..5ccb4c42e3cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: add3f2fa7a6cec16d35a95b9078e1ecc80a6f332 +refs/heads/master: cd3e76ebcb41c48ef6e706006b793d45030bae75 diff --git a/trunk/drivers/s390/net/qeth_eddp.c b/trunk/drivers/s390/net/qeth_eddp.c index 4640f32daae5..70108fb16906 100644 --- a/trunk/drivers/s390/net/qeth_eddp.c +++ b/trunk/drivers/s390/net/qeth_eddp.c @@ -424,8 +424,7 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, /* prepare qdio hdr */ if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2){ eddp->qh.hdr.l2.pkt_length = data_len + ETH_HLEN + - eddp->nhl + eddp->thl - - sizeof(struct qeth_hdr); + eddp->nhl + eddp->thl; #ifdef CONFIG_QETH_VLAN if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q)) eddp->qh.hdr.l2.pkt_length += VLAN_HLEN;