Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340461
b: refs/heads/master
c: f3f1213
h: refs/heads/master
i:
  340459: 2581c74
v: v3
  • Loading branch information
Neal Cardwell authored and David S. Miller committed Oct 23, 2012
1 parent 0c548cb commit 4c9ed1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0
refs/heads/master: f3f121359caa069cefbc48008e94bcd862ca21e2
4 changes: 2 additions & 2 deletions trunk/net/ipv6/tcp_ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -1741,11 +1741,11 @@ static void tcp_v6_early_demux(struct sk_buff *skb)
skb->destructor = sock_edemux;
if (sk->sk_state != TCP_TIME_WAIT) {
struct dst_entry *dst = sk->sk_rx_dst;
struct inet_sock *icsk = inet_sk(sk);

if (dst)
dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
if (dst &&
icsk->rx_dst_ifindex == skb->skb_iif)
inet_sk(sk)->rx_dst_ifindex == skb->skb_iif)
skb_dst_set_noref(skb, dst);
}
}
Expand Down

0 comments on commit 4c9ed1b

Please sign in to comment.