summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [XFRM]: BEET modeDiego Beltrami2006-10-0414-11/+309
| | | | | | | | | | | | | | | | | This patch introduces the BEET mode (Bound End-to-End Tunnel) with as specified by the ietf draft at the following link: http://www.ietf.org/internet-drafts/draft-nikander-esp-beet-mode-06.txt The patch provides only single family support (i.e. inner family = outer family). Signed-off-by: Diego Beltrami <diego.beltrami@gmail.com> Signed-off-by: Miika Komu <miika@iki.fi> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Abhinav Pathak <abhinav.pathak@hiit.fi> Signed-off-by: Jeff Ahrenholz <ahrenholz@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [TCP]: Kill warning in tcp_clean_rtx_queue().David S. Miller2006-10-041-1/+1
| | | | | | | GCC can't tell we always initialize 'tv' in all the cases we actually use it, so explicitly set it up with zeros. Signed-off-by: David S. Miller <davem@davemloft.net>
* [NET_SCHED]: Remove old estimator implementationPatrick McHardy2006-10-041-196/+0
| | | | | | | Remove unused file, estimators live in net/core/gen_estimator.c now. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [ATM]: [zatm] always *pcr in alloc_shaper()Chas Williams2006-10-041-0/+1
| | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
* [ATM]: [ambassador] Change the return type to reflect realityJeff Garzik2006-10-041-2/+2
| | | | | | Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
* [ATM]: kmalloc to kzalloc patches for drivers/atmOm Narasimhan2006-10-047-47/+16
| | | | | | Signed-off-by: Om Narasimhan <om.turyx@gmail.com> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
* [TIPC]: fix printk warningJeff Garzik2006-10-041-2/+3
| | | | | | | | | | | | | | | | | | gcc spits out this warning: net/tipc/link.c: In function ‘link_retransmit_failure’: net/tipc/link.c:1669: warning: cast from pointer to integer of different size More than a little bit ugly, storing integers in void*, but at least the code is correct, unlike some of the more crufty Linux kernel code found elsewhere. Rather than having two casts to massage the value into u32, it's easier just to have a single cast and use "%lu", since it's just a printk. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [XFRM]: Clearing xfrm_policy_count[] to zero during flush is incorrect.David S. Miller2006-10-041-2/+5
| | | | | | | | | | | | | When we flush policies, we do a type match so we might not actually delete all policies matching a certain direction. So keep track of how many policies we actually kill and subtract that number from xfrm_policy_count[dir] at the end. Based upon a patch by Masahide NAKAMURA. Signed-off-by: David S. Miller <davem@davemloft.net>
* [XFRM] STATE: Use destination address for src hash.Masahide NAKAMURA2006-10-042-10/+13
| | | | | | | | | | | | Src hash is introduced for Mobile IPv6 route optimization usage. On current kenrel code it is calculated with source address only. It results we uses the same hash value for outbound state (when the node has only one address for Mobile IPv6). This patch use also destination address as peer information for src hash to be dispersed. Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NEIGH]: always use hash_mask under tbl lockJulian Anastasov2006-10-041-6/+6
| | | | | | | | Make sure hash_mask is protected with tbl->lock in all cases just like the hash_buckets. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net>
* [UDP]: Fix MSG_PROBE crashHerbert Xu2006-10-042-0/+4
| | | | | | | | | | | | | UDP tracks corking status through the pending variable. The IP layer also tracks it through the socket write queue. It is possible for the two to get out of sync when MSG_PROBE is used. This patch changes UDP to check the write queue to ensure that the two stay in sync. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* [UDP6]: Fix flowi clobberingHerbert Xu2006-10-041-31/+31
| | | | | | | | | | The udp6_sendmsg function uses a shared buffer to store the flow without taking any locks. This leads to races with SMP. This patch moves the flowi object onto the stack. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE"Ismail Donmez2006-10-041-1/+1
| | | | | | | | | | With commit 10fd48f2376db52f08bf0420d2c4f580e39269e1 [1] , RB_EMPTY_NODE changed behaviour so it returns true when the node is empty as expected. Hence Patrick McHardy's fix for sched_htb.c should be reverted. Signed-off-by: Ismail Donmez <ismail@pardus.org.tr> ACKed-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: ebt_mark: add or/and/xor action support to mark targetBart De Schuymer2006-10-042-4/+29
| | | | | | | | | The following patch adds or/and/xor functionality for the mark target, while staying backwards compatible. Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: ipt_REJECT: remove largely duplicate route_reverse functionPatrick McHardy2006-10-041-78/+19
| | | | | | | | | | Use ip_route_me_harder instead, which now allows to specify how we wish the packet to be routed. Based on patch by Simon Horman <horms@verge.net.au>. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: Honour source routing for LVS-NATSimon Horman2006-10-041-0/+10
| | | | | | | | | | | | | | For policy routing, packets originating from this machine itself may be routed differently to packets passing through. We want this packet to be routed as if it came from this machine itself. So re-compute the routing information using ip_route_me_harder(). This patch is derived from work by Ken Brownfield Cc: Ken Brownfield <krb@irridia.com> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: add type parameter to ip_route_me_harderSimon Horman2006-10-044-6/+11
| | | | | | | | | | | By adding a type parameter to ip_route_me_harder() the expensive call to inet_addr_type() can be avoided in some cases. A followup patch where ip_route_me_harder() is called from within ip_vs_out() is one such example. Signed-off-By: Simon Horman <horms@verge.net.au> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: Kconfig: fix xt_physdev dependenciesPatrick McHardy2006-10-041-1/+1
| | | | | | | | | xt_physdev depends on bridge netfilter, which is a boolean, but can still be built modular because of special handling in the bridge makefile. Add a dependency on BRIDGE to prevent XT_MATCH_PHYSDEV=y, BRIDGE=m. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [PATCH] i383 numa: fix numaq/summit apicid conflictKeith Mannthey2006-10-032-2/+2
| | | | | | | | | | | This allows numaq to properly align cpus to their given node during boot. Pass logical apicid to apicid_to_node and allow the summit sub-arch to use physical apicid (hard_smp_processor_id()). Tested against numaq and summit based systems with no issues. Signed-off-by: Keith Mannthey <kmannth@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-10-03596-1333/+1095
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits) Add missing maintainer countries in CREDITS Fix bytes <-> kilobytes typo in Kconfig for ramdisk fix a typo in Documentation/pi-futex.txt BUG_ON conversion for fs/xfs/ BUG_ON() conversion in fs/nfsd/ BUG_ON conversion for fs/reiserfs BUG_ON cleanups in arch/i386 BUG_ON cleanup in drivers/net/tokenring/ BUG_ON cleanup for drivers/md/ kerneldoc-typo in led-class.c debugfs: spelling fix rcutorture: Fix incorrect description of default for nreaders parameter parport: Remove space in function calls Michal Wronski: update contact info Spelling fix: "control" instead of "cotrol" reboot parameter in Documentation/kernel-parameters.txt Fix copy&waste bug in comment in scripts/kernel-doc remove duplicate "until" from kernel/workqueue.c ite_gpio fix tabbage fix file specification in comments ... Fixed trivial path conflicts due to removed files: arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
| * Add missing maintainer countries in CREDITSSamuel Tardieu2006-10-031-0/+6
| | | | | | | | | | | | | | Add missing maintainer countries. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix bytes <-> kilobytes typo in Kconfig for ramdiskChristian Borntraeger2006-10-031-1/+1
| | | | | | | | | | | | | | | | This is a small fix for a typo in Kconfig. The default value for the block size is 1024 bytes not 1024 kilobytes. Signed-off-by: Christian Borntraeger <borntrae@de.ibm.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fix a typo in Documentation/pi-futex.txtRiccardo Magliocchetti2006-10-031-1/+1
| | | | | | | | | | Signed-off-by: Riccardo Magliocchetti <riccardo@datahost.it> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * BUG_ON conversion for fs/xfs/Eric Sesterhenn2006-10-031-4/+2
| | | | | | | | | | | | | | | | | | This patch converts two if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * BUG_ON() conversion in fs/nfsd/Eric Sesterhenn2006-10-031-2/+1
| | | | | | | | | | | | | | | | | | This patch converts an if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * BUG_ON conversion for fs/reiserfsEric Sesterhenn2006-10-035-54/+26
| | | | | | | | | | | | | | | | | | | | This patch converts several if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. S_ISREG() has no side effects, so the conversion is safe. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * BUG_ON cleanups in arch/i386Eric Sesterhenn2006-10-034-8/+4
| | | | | | | | | | | | | | | | This changes a couple of if() BUG(); constructs to BUG_ON(); so it can be safely optimized away. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * BUG_ON cleanup in drivers/net/tokenring/Eric Sesterhenn2006-10-031-2/+1
| | | | | | | | | | | | | | | | This patch converts one if() BUG(); to BUG_ON(); so it can be safely optimized away. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * BUG_ON cleanup for drivers/md/Eric Sesterhenn2006-10-032-3/+2
| | | | | | | | | | | | | | | | This changes two if() BUG(); usages to BUG_ON(); so people can disable it safely. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * kerneldoc-typo in led-class.cHenrik Kretzschmar2006-10-031-1/+1
| | | | | | | | | | | | | | Fixes a typo in led-class.c kerneldoc. Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * debugfs: spelling fixKomal Shah2006-10-031-1/+1
| | | | | | | | | | | | | | Change debufs_create_file() to debugfs_create_file(). Signed-off-by: Komal Shah <komal_shah802003@yahoo.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * rcutorture: Fix incorrect description of default for nreaders parameterJosh Triplett2006-10-031-1/+1
| | | | | | | | | | | | | | | | | | The comment for the nreaders parameter of rcutorture gives the default as 4*ncpus, but the value actually defaults to 2*ncpus; fix the comment. Signed-off-by: Josh Triplett <josh@freedesktop.org> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * parport: Remove space in function callsMatthew Martin2006-10-031-106/+106
| | | | | | | | | | | | | | This removes the space in function calls in drivers/parport/daisy.c Signed-off-by: Matthew Martin <lihnucks@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Michal Wronski: update contact infoMichal Wronski2006-10-032-2/+2
| | | | | | | | | | | | | | My email has changed. Signed-Off-By: Michal Wronski <michal.wronski@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Spelling fix: "control" instead of "cotrol"Michael Opdenacker2006-10-032-4/+4
| | | | | | | | | | | | | | | | This patch against fixes a spelling mistake ("control" instead of "cotrol"). Signed-off-by: Michael Opdenacker <michael@free-electrons.com> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * reboot parameter in Documentation/kernel-parameters.txtMichael Opdenacker2006-10-031-1/+1
| | | | | | | | | | | | | | | | Documentation fix for the arm and arm26 architectures, in which the reboot kernel parameter is set in arch/*/kernel/process.c Signed-off-by: Michael Opdenacker <michael@free-electrons.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix copy&waste bug in comment in scripts/kernel-docRolf Eike Beer2006-10-031-2/+2
| | | | | | | | | | | | | | | | This is obviously copied from some lines before without proper fixing. Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * remove duplicate "until" from kernel/workqueue.cRolf Eike Beer2006-10-031-1/+1
| | | | | | | | | | | | | | s/until until/until/ Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * ite_gpio fix tabbageJim Cromie2006-10-031-7/+7
| | | | | | | | | | | | caught some leading spaces in passing. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fix file specification in commentsUwe Zeisberger2006-10-03313-313/+313
| | | | | | | | | | | | | | Many files include the filename at the beginning, serveral used a wrong one. Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Documentation: remove duplicated wordsPaolo Ornati2006-10-0352-62/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove many duplicated words under Documentation/ and do other small cleanups. Examples: "and and" --> "and" "in in" --> "in" "the the" --> "the" "the the" --> "to the" ... Signed-off-by: Paolo Ornati <ornati@fastwebnet.it> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos in Documentation/: 'S'Matt LaPlante2006-10-0330-71/+72
| | | | | | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letter 'S'. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Alan Cox <alan@redhat.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos in Documentation/: 'Q'-'R'Matt LaPlante2006-10-0326-40/+40
| | | | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'Q'-'R'. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix "can not" in Documentation and KconfigMatt LaPlante2006-10-0324-31/+31
| | | | | | | | | | | | | | | | | | | | | | Randy brought it to my attention that in proper english "can not" should always be written "cannot". I donot see any reason to argue, even if I mightnot understand why this rule exists. This patch fixes "can not" in several Documentation files as well as three Kconfigs. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos in Documentation/: 'N'-'P'Matt LaPlante2006-10-0341-79/+78
| | | | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'N'-'P'. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos in Documentation/: 'H'-'M'Matt LaPlante2006-10-0339-62/+62
| | | | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'H'-'M'. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos in Documentation/: 'F'-'G'Matt LaPlante2006-10-0321-23/+23
| | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. The patch addresses some words starting with the letters 'F'-'G'. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos in Documentation/: 'D'-'E'Matt LaPlante2006-10-0338-64/+63
| | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letters 'D'-'E'. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos in Documentation/: 'B'-'C'Matt LaPlante2006-10-0319-38/+38
| | | | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letters 'B'-'C'. There are also a few grammar fixes thrown in for Randy. ;) Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix some typos in Documentation/: 'A'Matt LaPlante2006-10-0329-32/+32
| | | | | | | | | | | | | | | | | | | | This patch fixes typos in various Documentation txts. This patch addresses some words starting with the letter 'A'. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
OpenPOWER on IntegriCloud