Author: mguevara Date: Wed Jan 17 11:26:17 2007 GMT
Module: SOURCES Tag: LINUX_2_6_20
---- Log message:
- fix for net/ipv4/udp.c; applies cleanly on 2.6.20-rc5
---- Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.2.39 -> 1.2.2.40)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.2.39 SOURCES/linux-2.6-vs2.3.patch:1.2.2.40
--- SOURCES/linux-2.6-vs2.3.patch:1.2.2.39 Wed Jan 17 12:17:47 2007
+++ SOURCES/linux-2.6-vs2.3.patch Wed Jan 17 12:26:11 2007
@@ -30055,9 +30055,9 @@
--- linux-2.6.19.1/net/ipv4/udp.c 2006-11-30 21:19:45 +0100
+++ linux-2.6.19.1-vs2.3.0.6/net/ipv4/udp.c 2006-12-17 03:36:34 +0100
@@ -108,6 +108,7 @@
- #include <net/inet_common.h>
#include <net/checksum.h>
#include <net/xfrm.h>
+ #include "udp_impl.h"
+// #include <linux/vs_base.h>
/*
@@ -30068,7 +30068,7 @@
|| sk2->sk_bound_dev_if == sk->sk_bound_dev_if) &&
+ /* FIXME: nx_addr_conflict(sk->sk_nx_info,
+ inet_rcv_saddr(sk), sk2) && */
- (*saddr_cmp)(sk, sk2) )
+ (*saddr_comp)(sk, sk2) )
goto fail;
}
@@ -260,6 +263,11 @@ static struct sock *udp_v4_lookup_longwa
@@ -30112,7 +30112,7 @@
for (state->bucket = 0; state->bucket < UDP_HTABLE_SIZE; ++state->bucket) {
struct hlist_node *node;
+
- sk_for_each(sk, node, &udp_hash[state->bucket]) {
+ sk_for_each(sk, node, state->hashtable + state->bucket) {
- if (sk->sk_family == state->family)
+ if (sk->sk_family == state->family &&
+ nx_check(sk->sk_nid, VS_WATCH_P|VS_IDENT))
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.2.39&r2=1.2.2.40&f=u