Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9574
b: refs/heads/master
c: a5e7c21
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Oct 3, 2005
1 parent 33b8113 commit ffdf7e1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 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: f36d6ab182a5c68e92ea3e85821dde9d29bfe284
refs/heads/master: a5e7c210fefd2454c757a3542e41063407ca7108
14 changes: 10 additions & 4 deletions trunk/net/ipv6/udp.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,10 +852,16 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk,
else if (!corkreq)
err = udp_v6_push_pending_frames(sk, up);

if (dst && connected)
ip6_dst_store(sk, dst,
ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?
&np->daddr : NULL);
if (dst) {
if (connected) {
ip6_dst_store(sk, dst,
ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?
&np->daddr : NULL);
} else {
dst_release(dst);
}
}

if (err > 0)
err = np->recverr ? net_xmit_errno(err) : 0;
release_sock(sk);
Expand Down

0 comments on commit ffdf7e1

Please sign in to comment.