diff options
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index d10dfecb6cbd..2d8d6adf1616 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -1030,9 +1030,13 @@ static inline void sk_setup_caps(struct sock *sk, struct dst_entry *dst) | |||
| 1030 | { | 1030 | { |
| 1031 | __sk_dst_set(sk, dst); | 1031 | __sk_dst_set(sk, dst); |
| 1032 | sk->sk_route_caps = dst->dev->features; | 1032 | sk->sk_route_caps = dst->dev->features; |
| 1033 | if (sk->sk_route_caps & NETIF_F_GSO) | ||
| 1034 | sk->sk_route_caps |= NETIF_F_TSO; | ||
| 1033 | if (sk->sk_route_caps & NETIF_F_TSO) { | 1035 | if (sk->sk_route_caps & NETIF_F_TSO) { |
| 1034 | if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len) | 1036 | if (sock_flag(sk, SOCK_NO_LARGESEND) || dst->header_len) |
| 1035 | sk->sk_route_caps &= ~NETIF_F_TSO; | 1037 | sk->sk_route_caps &= ~NETIF_F_TSO; |
| 1038 | else | ||
| 1039 | sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM; | ||
| 1036 | } | 1040 | } |
| 1037 | } | 1041 | } |
| 1038 | 1042 | ||
| @@ -1265,6 +1269,7 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb) | |||
| 1265 | * sk_eat_skb - Release a skb if it is no longer needed | 1269 | * sk_eat_skb - Release a skb if it is no longer needed |
| 1266 | * @sk: socket to eat this skb from | 1270 | * @sk: socket to eat this skb from |
| 1267 | * @skb: socket buffer to eat | 1271 | * @skb: socket buffer to eat |
| 1272 | * @copied_early: flag indicating whether DMA operations copied this data early | ||
| 1268 | * | 1273 | * |
| 1269 | * This routine must be called with interrupts disabled or with the socket | 1274 | * This routine must be called with interrupts disabled or with the socket |
| 1270 | * locked so that the sk_buff queue operation is ok. | 1275 | * locked so that the sk_buff queue operation is ok. |