From 2e50cb8d296c27e2faf3c0ea8b52dff4e2b13dc0 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Fri, 14 Oct 2011 05:31:12 +0000 Subject: [PATCH] --- yaml --- r: 266827 b: refs/heads/master c: e6f8aa9b90dbb9dbe56e493b91132ced26eaaf81 h: refs/heads/master i: 266825: c6dd3c6a79316abeccd445d3c4e2f067a55e09cc 266823: e5bdefee874c37019b36853383ab1f7f7e91634f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 -- trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f787a20cbcb6..97569903132d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3428414f71e12f8111dfa16e4d958e6ed055268a +refs/heads/master: e6f8aa9b90dbb9dbe56e493b91132ced26eaaf81 diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c index bfd08b2a9910..adb462d0b8d3 100644 --- a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -2001,7 +2001,6 @@ static void xmit_common(struct sk_buff *skb, struct ehea_swqe *swqe) swqe->tcp_offset = swqe->ip_end + 1 + offsetof(struct udphdr, check); - swqe->tcp_end = skb->len - 1; break; case IPPROTO_TCP: @@ -2010,7 +2009,6 @@ static void xmit_common(struct sk_buff *skb, struct ehea_swqe *swqe) swqe->tcp_offset = swqe->ip_end + 1 + offsetof(struct tcphdr, check); - swqe->tcp_end = skb->len - 1; break; } } diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.h b/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.h index fddff8ec8cfd..337a47ecf4aa 100644 --- a/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.h +++ b/trunk/drivers/net/ethernet/ibm/ehea/ehea_qmr.h @@ -107,7 +107,7 @@ struct ehea_swqe { u8 immediate_data_length; u8 tcp_offset; u8 reserved2; - u16 tcp_end; + u16 reserved2b; u8 wrap_tag; u8 descriptors; /* number of valid descriptors in WQE */ u16 reserved3;