X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fnet%2Fsock.h;fp=include%2Fnet%2Fsock.h;h=924d3481bdeb2183e5f828364ad5264879ab9027;hb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;hp=f6e3f99c0b03d04898fea3602ef9b323ace33733;hpb=1db395853d4f30d6120458bd279ede1f882a8525;p=linux-2.6.git diff --git a/include/net/sock.h b/include/net/sock.h index f6e3f99c0..924d3481b 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1042,9 +1042,13 @@ static inline void sk_setup_caps(struct sock *sk, struct dst_entry *dst) { __sk_dst_set(sk, dst); sk->sk_route_caps = dst->dev->features; + if (sk->sk_route_caps & NETIF_F_GSO) + sk->sk_route_caps |= NETIF_F_TSO; if (sk->sk_route_caps & NETIF_F_TSO) { if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len) sk->sk_route_caps &= ~NETIF_F_TSO; + else + sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM; } }