From c3556a9acc7d0df22a3bd79aedc40a4cc00c528c Mon Sep 17 00:00:00 2001 From: Planet-Lab Support Date: Thu, 6 Oct 2005 18:53:19 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'after-andys-new-cpu-scheduler'. --- Makefile | 2 +- arch/xen/i386/kernel/Makefile | 4 ++-- net/ipv4/ip_output.c | 9 +++++++++ net/ipv4/netfilter/ip_conntrack_standalone.c | 7 ------- net/packet/af_packet.c | 6 ------ scripts/kernel-2.6-planetlab.spec | 19 +++---------------- 6 files changed, 15 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 1771b7dfd..ab6aae1dc 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 12 -EXTRAVERSION = -1.1_1398_FC4.1.planetlab +EXTRAVERSION = -1.1_1390_FC4.1.planetlab NAME=Woozy Numbat # *DOCUMENTATION* diff --git a/arch/xen/i386/kernel/Makefile b/arch/xen/i386/kernel/Makefile index 0edd0f45b..d047f36f2 100644 --- a/arch/xen/i386/kernel/Makefile +++ b/arch/xen/i386/kernel/Makefile @@ -88,8 +88,8 @@ $(obj)/vsyscall-syms.o: $(obj)/vsyscall.lds \ $(call if_changed,syscall) c-link := init_task.o -s-link := vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o # \ - # vsyscall-note.o MEF: looks like this should not be here. +s-link := vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o \ + vsyscall-note.o $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)): @ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@ diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 03189967d..0fe94ef35 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -111,6 +111,7 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb) #ifdef CONFIG_NETFILTER_DEBUG nf_debug_ip_loopback_xmit(newskb); #endif + nf_reset(newskb); netif_rx(newskb); return 0; } @@ -195,6 +196,14 @@ static inline int ip_finish_output2(struct sk_buff *skb) nf_debug_ip_finish_output2(skb); #endif /*CONFIG_NETFILTER_DEBUG*/ +#ifdef CONFIG_BRIDGE_NETFILTER + /* bridge-netfilter defers calling some IP hooks to the bridge layer + * and still needs the conntrack reference. + */ + if (skb->nf_bridge == NULL) +#endif + nf_reset(skb); + if (hh) { int hh_alen; diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index 084d4ef53..83a668c87 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -442,13 +442,6 @@ static unsigned int ip_conntrack_defrag(unsigned int hooknum, const struct net_device *out, int (*okfn)(struct sk_buff *)) { -#if !defined(CONFIG_IP_NF_NAT) && !defined(CONFIG_IP_NF_NAT_MODULE) - /* Previously seen (loopback)? Ignore. Do this before - fragment check. */ - if ((*pskb)->nfct) - return NF_ACCEPT; -#endif - /* Gather fragments. */ if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) { *pskb = ip_ct_gather_frags(*pskb, diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 10a79da10..2cd6d2972 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -274,9 +274,6 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct dst_release(skb->dst); skb->dst = NULL; - /* drop conntrack reference */ - nf_reset(skb); - spkt = (struct sockaddr_pkt*)skb->cb; skb_push(skb, skb->data-skb->mac.raw); @@ -526,9 +523,6 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packe dst_release(skb->dst); skb->dst = NULL; - /* drop conntrack reference */ - nf_reset(skb); - spin_lock(&sk->sk_receive_queue.lock); po->stats.tp_packets++; __skb_queue_tail(&sk->sk_receive_queue, skb); diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec index 40851859e..0a2d12c24 100644 --- a/scripts/kernel-2.6-planetlab.spec +++ b/scripts/kernel-2.6-planetlab.spec @@ -62,9 +62,7 @@ Summary: The Linux kernel (the core of the Linux operating system) # # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok. # - -# MEF commented out -# %define xen_conflicts glibc < 2.3.5-1 +%define xen_conflicts glibc < 2.3.5-1 # # Packages that need to be installed before the kernel is, because the %post @@ -191,10 +189,7 @@ Prereq: %{kernel_prereq} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} Conflicts: %{nptl_conflicts} - -# MEF commented out -# Conflicts: %{xen_conflicts} - +Conflicts: %{xen_conflicts} # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency from the module headers which # isn't required for the kernel proper to function @@ -370,11 +365,8 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source) # first copy everything - cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp --parents `find -type f -name Makefile -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - if [ "$1" = "uml" ] ; then - cp --parents -a `find arch/um -name include` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - fi # then drop all but the needed Makefiles/Kconfig files rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts @@ -396,11 +388,6 @@ BuildKernel() { %if %{buildxen} cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include %endif - if [ "$1" = "uml" ] ; then - cd asm - cp -a `readlink arch` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - cd .. - fi cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include # Make sure the Makefile and version.h have a matching timestamp so that # external modules can be built -- 2.47.0