ip_gre: propogate target device GSO capability to the tunnel device

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index cdc31ac4a9dfa1227df35b233c1033b7c0320022..31bc9415269337f80ca6483069d99909e06675e6 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1103,8 +1103,14 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev)
        tunnel->hlen = addend;
        /* TCP offload with GRE SEQ is not supported. */
        if (!(tunnel->parms.o_flags & GRE_SEQ)) {
-               dev->features           |= NETIF_F_GSO_SOFTWARE;
-               dev->hw_features        |= NETIF_F_GSO_SOFTWARE;
+               /* device supports enc gso offload*/
+               if (tdev->hw_enc_features & NETIF_F_GRE_GSO) {
+                       dev->features           |= NETIF_F_TSO;
+                       dev->hw_features        |= NETIF_F_TSO;
+               } else {
+                       dev->features           |= NETIF_F_GSO_SOFTWARE;
+                       dev->hw_features        |= NETIF_F_GSO_SOFTWARE;
+               }
        }
 
        return mtu;