rpms/kernel/FC-3 linux-2.6-CAN-2005-2973.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv31975

Modified Files:
	linux-2.6-CAN-2005-2973.patch 
Log Message:
bogus hunk


linux-2.6-CAN-2005-2973.patch:
 udp.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-CAN-2005-2973.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6-CAN-2005-2973.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-CAN-2005-2973.patch	19 Oct 2005 23:36:52 -0000	1.1
+++ linux-2.6-CAN-2005-2973.patch	20 Oct 2005 00:26:44 -0000	1.2
@@ -18,26 +18,3 @@
  gotit:
  		udp_port_rover = snum = result;
  	} else {
---- linux-2.6.12/net/ipv6/udp.c~	2005-10-19 18:49:20.000000000 -0400
-+++ linux-2.6.12/net/ipv6/udp.c	2005-10-19 18:50:44.000000000 -0400
-@@ -844,10 +844,16 @@ do_append_data:
- 	else if (!corkreq)
- 		err = udp_v6_push_pending_frames(sk, up);
- 
--	if (dst)
--		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);