diff options
| author | Dmitry Kravkov <dmitry@broadcom.com> | 2013-02-18 09:50:53 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-19 00:51:09 -0500 |
| commit | eb6b9a8cad65e820b145547844b108117cece3a0 (patch) | |
| tree | efab28c91982488d59a9074acb63f302eff72957 /net/ipv4 | |
| parent | aa0e51cdda005cd37e23751de54443b1e73e7def (diff) | |
| download | linux-eb6b9a8cad65e820b145547844b108117cece3a0.tar.bz2 | |
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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_gre.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index cdc31ac4a9df..31bc94152693 100644 --- 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; |