From: Greg Kroah-Hartman Date: Tue, 8 Nov 2005 18:11:09 +0000 (-0800) Subject: added more stable patches X-Git-Tag: v2.6.14.1~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dded0940e9e03b8431b3a504e5cb84e20bf7480;p=thirdparty%2Fkernel%2Fstable-queue.git added more stable patches --- diff --git a/queue/airo.c-airo_cs.c-correct-prototypes.patch b/queue/airo.c-airo_cs.c-correct-prototypes.patch new file mode 100644 index 00000000000..bfb5b7a2be5 --- /dev/null +++ b/queue/airo.c-airo_cs.c-correct-prototypes.patch @@ -0,0 +1,79 @@ +From stable-bounces@linux.kernel.org Sat Nov 5 08:42:46 2005 +Date: Sat, 5 Nov 2005 17:42:27 +0100 +From: Adrian Bunk +To: jgarzik@pobox.com +Message-ID: <20051105164227.GK5368@stusta.de> +Content-Disposition: inline +Cc: netdev@vger.kernel.org, Benjamin Reed , linux-kernel@vger.kernel.org, stable@kernel.org +Subject: airo.c/airo_cs.c: correct prototypes + +This patch creates a file airo.h containing prototypes of the global +functions in airo.c used by airo_cs.c . + +If you got strange problems with either airo_cs devices or in any other +completely unrelated part of the kernel shortly or long after a airo_cs +device was detected by the kernel, this might have been caused by the +fact that caller and callee disagreed regarding the size of the first +argument to init_airo_card()... + +Signed-off-by: Adrian Bunk +Signed-off-by: Greg Kroah-Hartman + +--- + + drivers/net/wireless/airo.c | 2 ++ + drivers/net/wireless/airo.h | 9 +++++++++ + drivers/net/wireless/airo_cs.c | 6 ++---- + 3 files changed, 13 insertions(+), 4 deletions(-) + +--- /dev/null 2005-04-28 03:52:17.000000000 +0200 ++++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.h 2005-11-05 16:57:14.000000000 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _AIRO_H_ ++#define _AIRO_H_ ++ ++struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia, ++ struct device *dmdev); ++int reset_airo_card(struct net_device *dev); ++void stop_airo_card(struct net_device *dev, int freeres); ++ ++#endif /* _AIRO_H_ */ +--- linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.c.old 2005-11-05 16:54:10.000000000 +0100 ++++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.c 2005-11-05 16:54:43.000000000 +0100 +@@ -47,6 +47,8 @@ + #include + #include + ++#include "airo.h" ++ + #ifdef CONFIG_PCI + static struct pci_device_id card_ids[] = { + { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, +--- linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo_cs.c.old 2005-11-05 16:57:27.000000000 +0100 ++++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo_cs.c 2005-11-05 16:57:58.000000000 +0100 +@@ -42,6 +42,8 @@ + #include + #include + ++#include "airo.h" ++ + /* + All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If + you do not define PCMCIA_DEBUG at all, all the debug code will be +@@ -78,10 +80,6 @@ + event handler. + */ + +-struct net_device *init_airo_card( int, int, int, struct device * ); +-void stop_airo_card( struct net_device *, int ); +-int reset_airo_card( struct net_device * ); +- + static void airo_config(dev_link_t *link); + static void airo_release(dev_link_t *link); + static int airo_event(event_t event, int priority, + +_______________________________________________ +stable mailing list +stable@linux.kernel.org +http://linux.kernel.org/mailman/listinfo/stable + diff --git a/queue/fix-zero-size-datagram-reception.patch b/queue/fix-zero-size-datagram-reception.patch new file mode 100644 index 00000000000..92667cc74b8 --- /dev/null +++ b/queue/fix-zero-size-datagram-reception.patch @@ -0,0 +1,36 @@ +From stable-bounces@linux.kernel.org Wed Nov 2 15:36:17 2005 +Date: Thu, 3 Nov 2005 07:55:38 +1100 +To: Arnaldo Carvalho de Melo , netdev@vger.kernel.org, stable@kernel.org +Message-ID: <20051102205538.GA24276@gondor.apana.org.au> +Content-Disposition: inline +From: Herbert Xu +Cc: phillips@istop.com +Subject: [NET] Fix zero-size datagram reception + +The recent rewrite of skb_copy_datagram_iovec broke the reception of +zero-size datagrams. This patch fixes it. + +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + +diff --git a/net/core/datagram.c b/net/core/datagram.c +--- a/net/core/datagram.c ++++ b/net/core/datagram.c +@@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct + { + int i, err, fraglen, end = 0; + struct sk_buff *next = skb_shinfo(skb)->frag_list; ++ ++ if (!len) ++ return 0; ++ + next_skb: + fraglen = skb_headlen(skb); + i = -1; +_______________________________________________ +stable mailing list +stable@linux.kernel.org +http://linux.kernel.org/mailman/listinfo/stable + diff --git a/queue/ppc64-memory-model-depends-on-numa.patch b/queue/ppc64-memory-model-depends-on-numa.patch new file mode 100644 index 00000000000..d203d126fd2 --- /dev/null +++ b/queue/ppc64-memory-model-depends-on-numa.patch @@ -0,0 +1,70 @@ +From stable-bounces@linux.kernel.org Fri Oct 28 07:50:40 2005 +Message-ID: <436239DE.6020806@austin.ibm.com> +Date: Fri, 28 Oct 2005 09:46:54 -0500 +From: Joel Schopp +To: stable@kernel.org +Cc: +Subject: [PATCH] ppc64 memory model depends on NUMA + +From: Andy Whitcroft + +Currently when we first select memory model (FLAT, DISCONTIG, SPARSE) +then select whether the machine is NUMA. However NUMA systems may not +be FLAT. This constraint it not honoured and we may configure a NUMA/FLAT +system. + +Reorder the configuration such that we choose NUMA first which allows us +to only list the memory models which are valid. We now default NUMA +for known NUMA systems. Note that this new order also matches that +used in x86. + +Signed-off-by: Andy Whitcroft +Signed-off-by: Joel Schopp +Signed-off-by: Greg Kroah-Hartman + +--- +diff -upN reference/arch/ppc64/Kconfig current/arch/ppc64/Kconfig +--- reference/arch/ppc64/Kconfig ++++ current/arch/ppc64/Kconfig +@@ -234,6 +234,10 @@ config HMT + This option enables hardware multithreading on RS64 cpus. + pSeries systems p620 and p660 have such a cpu type. + ++config NUMA ++ bool "NUMA support" ++ default y if SMP && PPC_PSERIES ++ + config ARCH_SELECT_MEMORY_MODEL + def_bool y + +@@ -249,9 +253,6 @@ config ARCH_DISCONTIGMEM_DEFAULT + def_bool y + depends on ARCH_DISCONTIGMEM_ENABLE + +-config ARCH_FLATMEM_ENABLE +- def_bool y +- + config ARCH_SPARSEMEM_ENABLE + def_bool y + depends on ARCH_DISCONTIGMEM_ENABLE +@@ -274,10 +275,6 @@ config NODES_SPAN_OTHER_NODES + def_bool y + depends on NEED_MULTIPLE_NODES + +-config NUMA +- bool "NUMA support" +- default y if DISCONTIGMEM || SPARSEMEM +- + config SCHED_SMT + bool "SMT (Hyperthreading) scheduler support" + depends on SMP +_______________________________________________ +Linuxppc64-dev mailing list +Linuxppc64-dev@ozlabs.org +https://ozlabs.org/mailman/listinfo/linuxppc64-dev + +_______________________________________________ +stable mailing list +stable@linux.kernel.org +http://linux.kernel.org/mailman/listinfo/stable + diff --git a/queue/series b/queue/series index 6e1bfa38e8b..663fb1ec529 100644 --- a/queue/series +++ b/queue/series @@ -3,3 +3,7 @@ xfs-modular-quota-build-fix.patch 4GB-memory-intel-dual-core.patch cfq-io-sched-fix.patch usb-interface-modalias-fix.patch +tcp-bic-max-increment-too-large.patch +ppc64-memory-model-depends-on-numa.patch +airo.c-airo_cs.c-correct-prototypes.patch +fix-zero-size-datagram-reception.patch diff --git a/queue/tcp-bic-max-increment-too-large.patch b/queue/tcp-bic-max-increment-too-large.patch new file mode 100644 index 00000000000..254f5912dc1 --- /dev/null +++ b/queue/tcp-bic-max-increment-too-large.patch @@ -0,0 +1,37 @@ +From stable-bounces@linux.kernel.org Sat Nov 5 10:41:13 2005 +Date: Tue, 1 Nov 2005 15:26:45 -0800 +From: Stephen Hemminger +To: Arnaldo Carvalho de Melo , "David S. Miller" +Message-ID: <20051101152645.31075d19@dxpl.pdx.osdl.net> +Cc: netdev@vger.kernel.org +Subject: tcp: BIC max increment too large + +The max growth of BIC TCP is too large. Original code was based on +BIC 1.0 and the default there was 32. Later code (2.6.13) included +compensation for delayed acks, and should have reduced the default +value to 16; since normally TCP gets one ack for every two packets sent. + +The current value of 32 makes BIC too aggressive and unfair to other +flows. + +Submitted-by: Injong Rhee +Signed-off-by: Stephen Hemminger +Signed-off-by: Greg Kroah-Hartman + +--- tcp-2.6.orig/net/ipv4/tcp_bic.c ++++ tcp-2.6/net/ipv4/tcp_bic.c +@@ -27,7 +27,7 @@ + */ + + static int fast_convergence = 1; +-static int max_increment = 32; ++static int max_increment = 16; + static int low_window = 14; + static int beta = 819; /* = 819/1024 (BICTCP_BETA_SCALE) */ + static int low_utilization_threshold = 153; + +_______________________________________________ +stable mailing list +stable@linux.kernel.org +http://linux.kernel.org/mailman/listinfo/stable +