aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-10-14 01:31:12 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-17 19:00:55 -0400
commite6f8aa9b90dbb9dbe56e493b91132ced26eaaf81 (patch)
tree6a521e5c9d67c4033a7c322ffaf13d07384edc1f /drivers
parent3428414f71e12f8111dfa16e4d958e6ed055268a (diff)
ehea: Remove unused tcp_end field in send WQ
The tcp_end field is not actually used by the hardware, so there is no need to set it. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c2
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_qmr.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index bfd08b2a991..adb462d0b8d 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -2001,7 +2001,6 @@ static void xmit_common(struct sk_buff *skb, struct ehea_swqe *swqe)
2001 2001
2002 swqe->tcp_offset = swqe->ip_end + 1 + 2002 swqe->tcp_offset = swqe->ip_end + 1 +
2003 offsetof(struct udphdr, check); 2003 offsetof(struct udphdr, check);
2004 swqe->tcp_end = skb->len - 1;
2005 break; 2004 break;
2006 2005
2007 case IPPROTO_TCP: 2006 case IPPROTO_TCP:
@@ -2010,7 +2009,6 @@ static void xmit_common(struct sk_buff *skb, struct ehea_swqe *swqe)
2010 2009
2011 swqe->tcp_offset = swqe->ip_end + 1 + 2010 swqe->tcp_offset = swqe->ip_end + 1 +
2012 offsetof(struct tcphdr, check); 2011 offsetof(struct tcphdr, check);
2013 swqe->tcp_end = skb->len - 1;
2014 break; 2012 break;
2015 } 2013 }
2016} 2014}
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.h b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
index fddff8ec8cf..337a47ecf4a 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
@@ -107,7 +107,7 @@ struct ehea_swqe {
107 u8 immediate_data_length; 107 u8 immediate_data_length;
108 u8 tcp_offset; 108 u8 tcp_offset;
109 u8 reserved2; 109 u8 reserved2;
110 u16 tcp_end; 110 u16 reserved2b;
111 u8 wrap_tag; 111 u8 wrap_tag;
112 u8 descriptors; /* number of valid descriptors in WQE */ 112 u8 descriptors; /* number of valid descriptors in WQE */
113 u16 reserved3; 113 u16 reserved3;