2 files changed, 21 insertions, 5 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index cead6be467..fa5671307b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -308,9 +308,12 @@ struct net_device
 #define NETIF_F_HW_VLAN_RX      256     /* Receive VLAN hw acceleration */
 #define NETIF_F_HW_VLAN_FILTER  512     /* Receive filtering on VLAN */
 #define NETIF_F_VLAN_CHALLENGED 1024    /* Device cannot handle VLAN packets */
-#define NETIF_F_TSO             2048    /* Can offload TCP/IP segmentation */
 #define NETIF_F_LLTX            4096    /* LockLess TX */
-#define NETIF_F_UFO             8192    /* Can offload UDP Large Send*/
+
+        /* Segmentation offload features */
+#define NETIF_F_GSO_SHIFT       16
+#define NETIF_F_TSO             (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
+#define NETIF_F_UFO             (SKB_GSO_UDPV4 << NETIF_F_GSO_SHIFT)
 
 #define NETIF_F_GEN_CSUM        (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
 #define NETIF_F_ALL_CSUM        (NETIF_F_IP_CSUM | NETIF_F_GEN_CSUM)
@@ -979,6 +982,13 @@ extern void dev_seq_stop(struct seq_file *seq, void *v);
 
 extern void linkwatch_run_queue(void);
 
+static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
+{
+        int feature = skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT;
+        return skb_shinfo(skb)->gso_size &&
+               (dev->features & feature) != feature;
+}
+
 #endif /* __KERNEL__ */
 
 #endif  /* _LINUX_DEV_H */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index f8c7eb79a2..97b0d2d1a6 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -134,9 +134,10 @@ struct skb_frag_struct {
 struct skb_shared_info {
         atomic_t        dataref;
         unsigned short  nr_frags;
-        unsigned short  tso_size;
-        unsigned short  tso_segs;
-        unsigned short  ufo_size;
+        unsigned short  gso_size;
+        /* Warning: this field is not always filled in (UFO)! */
+        unsigned short  gso_segs;
+        unsigned short  gso_type;
         unsigned int    ip6_frag_id;
         struct sk_buff  *frag_list;
         skb_frag_t      frags[MAX_SKB_FRAGS];
@@ -168,6 +169,11 @@ enum {
         SKB_FCLONE_CLONE,
 };
 
+enum {
+        SKB_GSO_TCPV4 = 1 << 0,
+        SKB_GSO_UDPV4 = 1 << 1,
+};
+
 /** 
  *      struct sk_buff - socket buffer
  *      @next: Next buffer in list