diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-14 22:36:31 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-14 22:36:31 -0500 |
commit | 0ed3f64ec3a7ad29e83e03607115eeffa32f553c (patch) | |
tree | 528681b043e947cfc51527d56098f586b6dfa217 /net/ipv6/raw.c | |
parent | 5815449d1bfcb22f74b0e36a8b0631d6584cb7fc (diff) | |
parent | 10ee39fe3ff618d274e1cd0f6abbc2917b736bfd (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r-- | net/ipv6/raw.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 738376cf0c51..ae20a0ec9bd8 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -803,10 +803,7 @@ back_from_confirm: | |||
803 | err = rawv6_push_pending_frames(sk, &fl, rp); | 803 | err = rawv6_push_pending_frames(sk, &fl, rp); |
804 | } | 804 | } |
805 | done: | 805 | done: |
806 | ip6_dst_store(sk, dst, | 806 | dst_release(dst); |
807 | ipv6_addr_equal(&fl.fl6_dst, &np->daddr) ? | ||
808 | &np->daddr : NULL); | ||
809 | |||
810 | release_sock(sk); | 807 | release_sock(sk); |
811 | out: | 808 | out: |
812 | fl6_sock_release(flowlabel); | 809 | fl6_sock_release(flowlabel); |