diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:40:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:40:17 -0400 |
| commit | e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb (patch) | |
| tree | f9da35cbd79b52a5bd08d4a0f960bde6af741da0 /net/ipv6/inet6_connection_sock.c | |
| parent | 93fdf10d4c28edaa1b9f80e7f9c3002359186d00 (diff) | |
| parent | f83ef8c0b58dac17211a4c0b6df0e2b1bd6637b1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV6]: Added GSO support for TCPv6
[NET]: Generalise TSO-specific bits from skb_setup_caps
[IPV6]: Added GSO support for TCPv6
[IPV6]: Remove redundant length check on input
[NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunks
[TG3]: Update version and reldate
[TG3]: Add TSO workaround using GSO
[TG3]: Turn on hw fix for ASF problems
[TG3]: Add rx BD workaround
[TG3]: Add tg3_netif_stop() in vlan functions
[TCP]: Reset gso_segs if packet is dodgy
Diffstat (limited to 'net/ipv6/inet6_connection_sock.c')
| -rw-r--r-- | net/ipv6/inet6_connection_sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 11536db225d7..5c950cc79d80 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
| @@ -186,8 +186,6 @@ int inet6_csk_xmit(struct sk_buff *skb, int ipfragok) | |||
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | ip6_dst_store(sk, dst, NULL); | 188 | ip6_dst_store(sk, dst, NULL); |
| 189 | sk->sk_route_caps = dst->dev->features & | ||
| 190 | ~(NETIF_F_IP_CSUM | NETIF_F_TSO); | ||
| 191 | } | 189 | } |
| 192 | 190 | ||
| 193 | skb->dst = dst_clone(dst); | 191 | skb->dst = dst_clone(dst); |