[NET]: Merge TSO/UFO fields in sk_buff

Having separate fields in sk_buff for TSO/UFO (tso_size/ufo_size) is not
going to scale if we add any more segmentation methods (e.g., DCCP).  So
let's merge them.

They were used to tell the protocol of a packet.  This function has been
subsumed by the new gso_type field.  This is essentially a set of netdev
feature bits (shifted by 16 bits) that are required to process a specific
skb.  As such it's easy to tell whether a given device can process a GSO
skb: you just have to and the gso_type field and the netdev's features
field.

I've made gso_type a conjunction.  The idea is that you have a base type
(e.g., SKB_GSO_TCPV4) that can be modified further to support new features.
For example, if we add a hardware TSO type that supports ECN, they would
declare NETIF_F_TSO | NETIF_F_TSO_ECN.  All TSO packets with CWR set would
have a gso_type of SKB_GSO_TCPV4 | SKB_GSO_TCPV4_ECN while all other TSO
packets would be SKB_GSO_TCPV4.  This means that only the CWR packets need
to be emulated in software.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index 0bab60a20309..38aad8321456 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -420,7 +420,7 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
        }
         tcph = eddp->skb->h.th;
         while (eddp->skb_offset < eddp->skb->len) {
-                data_len = min((int)skb_shinfo(eddp->skb)->tso_size,
+                data_len = min((int)skb_shinfo(eddp->skb)->gso_size,
                                (int)(eddp->skb->len - eddp->skb_offset));
                 /* prepare qdio hdr */
                 if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2){
@@ -515,20 +515,20 @@ qeth_eddp_calc_num_pages(struct qeth_eddp_context *ctx, struct sk_buff *skb,
 
         QETH_DBF_TEXT(trace, 5, "eddpcanp");
         /* can we put multiple skbs in one page? */
-        skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->tso_size + hdr_len);
+        skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->gso_size + hdr_len);
         if (skbs_per_page > 1){
-                ctx->num_pages = (skb_shinfo(skb)->tso_segs + 1) /
+                ctx->num_pages = (skb_shinfo(skb)->gso_segs + 1) /
                                  skbs_per_page + 1;
                 ctx->elements_per_skb = 1;
         } else {
                 /* no -> how many elements per skb? */
-                ctx->elements_per_skb = (skb_shinfo(skb)->tso_size + hdr_len +
+                ctx->elements_per_skb = (skb_shinfo(skb)->gso_size + hdr_len +
                                      PAGE_SIZE) >> PAGE_SHIFT;
                 ctx->num_pages = ctx->elements_per_skb *
-                                 (skb_shinfo(skb)->tso_segs + 1);
+                                 (skb_shinfo(skb)->gso_segs + 1);
         }
         ctx->num_elements = ctx->elements_per_skb *
-                            (skb_shinfo(skb)->tso_segs + 1);
+                            (skb_shinfo(skb)->gso_segs + 1);
 }
 
 static inline struct qeth_eddp_context *
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 9e671a48cd2f..56009d768326 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -4417,7 +4417,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
         struct qeth_eddp_context *ctx = NULL;
         int tx_bytes = skb->len;
         unsigned short nr_frags = skb_shinfo(skb)->nr_frags;
-        unsigned short tso_size = skb_shinfo(skb)->tso_size;
+        unsigned short tso_size = skb_shinfo(skb)->gso_size;
         int rc;
 
         QETH_DBF_TEXT(trace, 6, "sendpkt");
@@ -4453,7 +4453,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
         queue = card->qdio.out_qs
                 [qeth_get_priority_queue(card, skb, ipv, cast_type)];
 
-        if (skb_shinfo(skb)->tso_size)
+        if (skb_shinfo(skb)->gso_size)
                 large_send = card->options.large_send;
 
         /*are we able to do TSO ? If so ,prepare and send it from here */
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h
index 24ef40ca9562..593f298142c1 100644
--- a/drivers/s390/net/qeth_tso.h
+++ b/drivers/s390/net/qeth_tso.h
@@ -51,7 +51,7 @@ qeth_tso_fill_header(struct qeth_card *card, struct sk_buff *skb)
         hdr->ext.hdr_version = 1;
         hdr->ext.hdr_len     = 28;
         /*insert non-fix values */
-        hdr->ext.mss = skb_shinfo(skb)->tso_size;
+        hdr->ext.mss = skb_shinfo(skb)->gso_size;
         hdr->ext.dg_hdr_len = (__u16)(iph->ihl*4 + tcph->doff*4);
         hdr->ext.payload_len = (__u16)(skb->len - hdr->ext.dg_hdr_len -
                                        sizeof(struct qeth_hdr_tso));