1 files changed, 28 insertions, 7 deletions

diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index a341041a6cf7..a755b57db46b 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -24,7 +24,7 @@
 
 #include "qeth_mpc.h"
 
-#define VERSION_QETH_H          "$Revision: 1.135 $"
+#define VERSION_QETH_H          "$Revision: 1.139 $"
 
 #ifdef CONFIG_QETH_IPV6
 #define QETH_VERSION_IPV6       ":IPv6"
@@ -288,7 +288,8 @@ qeth_is_ipa_enabled(struct qeth_ipa_info *ipa, enum qeth_ipa_funcs func)
 #define QETH_TX_TIMEOUT         100 * HZ
 #define QETH_HEADER_SIZE        32
 #define MAX_PORTNO              15
-#define QETH_FAKE_LL_LEN        ETH_HLEN
+#define QETH_FAKE_LL_LEN_ETH    ETH_HLEN
+#define QETH_FAKE_LL_LEN_TR     (sizeof(struct trh_hdr)-TR_MAXRIFLEN+sizeof(struct trllc))
 #define QETH_FAKE_LL_V6_ADDR_POS 24
 
 /*IPv6 address autoconfiguration stuff*/
@@ -369,6 +370,25 @@ struct qeth_hdr {
         } hdr;
 } __attribute__ ((packed));
 
+/*TCP Segmentation Offload header*/
+struct qeth_hdr_ext_tso {
+        __u16 hdr_tot_len;
+        __u8  imb_hdr_no;
+        __u8  reserved;
+        __u8  hdr_type;
+        __u8  hdr_version;
+        __u16 hdr_len;
+        __u32 payload_len;
+        __u16 mss;
+        __u16 dg_hdr_len;
+        __u8  padding[16];
+} __attribute__ ((packed));
+
+struct qeth_hdr_tso {
+        struct qeth_hdr hdr;    /*hdr->hdr.l3.xxx*/
+        struct qeth_hdr_ext_tso ext;
+} __attribute__ ((packed));
+
 
 /* flags for qeth_hdr.flags */
 #define QETH_HDR_PASSTHRU 0x10
@@ -866,6 +886,7 @@ qeth_push_skb(struct qeth_card *card, struct sk_buff **skb, int size)
         return hdr;
 }
 
+
 inline static int
 qeth_get_hlen(__u8 link_type)
 {
@@ -873,19 +894,19 @@ qeth_get_hlen(__u8 link_type)
         switch (link_type) {
         case QETH_LINK_TYPE_HSTR:
         case QETH_LINK_TYPE_LANE_TR:
-                return sizeof(struct qeth_hdr) + TR_HLEN;
+                return sizeof(struct qeth_hdr_tso) + TR_HLEN;
         default:
 #ifdef CONFIG_QETH_VLAN
-                return sizeof(struct qeth_hdr) + VLAN_ETH_HLEN;
+                return sizeof(struct qeth_hdr_tso) + VLAN_ETH_HLEN;
 #else
-                return sizeof(struct qeth_hdr) + ETH_HLEN;
+                return sizeof(struct qeth_hdr_tso) + ETH_HLEN;
 #endif
         }
 #else  /* CONFIG_QETH_IPV6 */
 #ifdef CONFIG_QETH_VLAN
-        return sizeof(struct qeth_hdr) + VLAN_HLEN;
+        return sizeof(struct qeth_hdr_tso) + VLAN_HLEN;
 #else
-        return sizeof(struct qeth_hdr);
+        return sizeof(struct qeth_hdr_tso);
 #endif
 #endif /* CONFIG_QETH_IPV6 */
 }