linux-2.6
19 years ago[PKT_SCHED]: Fix dsmark to apply changes consistent
Thomas Graf [Sun, 19 Jun 2005 05:52:54 +0000 (22:52 -0700)] 
[PKT_SCHED]: Fix dsmark to apply changes consistent

Fixes dsmark to do all configuration sanity checks first and
only apply the changes if all of them can be applied without
any errors. Also fixes the weak sanity checks for DSMARK_VALUE
and DSMASK_MASK.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[RTNETLINK]: Add RTA_(PUT|GET) shortcuts for u8, u16, and flag
Thomas Graf [Sun, 19 Jun 2005 05:52:36 +0000 (22:52 -0700)] 
[RTNETLINK]: Add RTA_(PUT|GET) shortcuts for u8, u16, and flag

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NEIGH]: Fix use of uninitialized variable when trimming in neightbl_fill_parms
Thomas Graf [Sun, 19 Jun 2005 05:52:09 +0000 (22:52 -0700)] 
[NEIGH]: Fix use of uninitialized variable when trimming in neightbl_fill_parms

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETLINK]: Kill bogus NLMSG_SET_MULTIPART uses.
Thomas Graf [Sun, 19 Jun 2005 05:51:43 +0000 (22:51 -0700)] 
[NETLINK]: Kill bogus NLMSG_SET_MULTIPART uses.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETLINK]: Fix RTA_NEST_CANCEL().
Thomas Graf [Sun, 19 Jun 2005 05:51:26 +0000 (22:51 -0700)] 
[NETLINK]: Fix RTA_NEST_CANCEL().

Only skb_trim() if 'start' is non-NULL.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NEIGHBOUR]: Remove unused fields in struct neigh_parms and neigh_table
Thomas Graf [Sun, 19 Jun 2005 05:51:12 +0000 (22:51 -0700)] 
[NEIGHBOUR]: Remove unused fields in struct neigh_parms and neigh_table

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETLINK]: Neighbour table configuration and statistics via rtnetlink
Thomas Graf [Sun, 19 Jun 2005 05:50:55 +0000 (22:50 -0700)] 
[NETLINK]: Neighbour table configuration and statistics via rtnetlink

To retrieve the neighbour tables send RTM_GETNEIGHTBL with the
NLM_F_DUMP flag set. Every neighbour table configuration is
spread over multiple messages to avoid running into message
size limits on systems with many interfaces. The first message
in the sequence transports all not device specific data such as
statistics, configuration, and the default parameter set.
This message is followed by 0..n messages carrying device
specific parameter sets.

Although the ordering should be sufficient, NDTA_NAME can be
used to identify sequences. The initial message can be identified
by checking for NDTA_CONFIG. The device specific messages do
not contain this TLV but have NDTPA_IFINDEX set to the
corresponding interface index.

To change neighbour table attributes, send RTM_SETNEIGHTBL
with NDTA_NAME set. Changeable attribute include NDTA_THRESH[1-3],
NDTA_GC_INTERVAL, and all TLVs in NDTA_PARMS unless marked
otherwise. Device specific parameter sets can be changed by
setting NDTPA_IFINDEX to the interface index of the corresponding
device.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETLINK] Routing attribute related shortcuts
Thomas Graf [Sun, 19 Jun 2005 05:50:38 +0000 (22:50 -0700)] 
[NETLINK] Routing attribute related shortcuts

 RTA_GET_U(32|64)(tlv)
   Assumes TLV is a u32/u64 field and returns its value.

 RTA_GET_[M]SECS(tlv)
   Assumes TLV is a u64 and transports jiffies converted
   to seconds or milliseconds and returns its value.

 RTA_PUT_U(32|64)(skb, type, value)
   Appends %value as fixed u32/u64 to %skb as TLV %type.

 RTA_PUT_[M]SECS(skb, type, jiffies)
   Converts %jiffies to secs/msecs and appends it as u64
   to %skb as TLV %type.

 RTA_PUT_STRING(skb, type, string)
   Appends %NUL terminated %string to %skb as TLV %type.

 RTA_NEST(skb, type)
   Starts a nested TLV %type and returns the nesting handle.

 RTA_NEST_END(skb, nesting_handle)
   Finishes the nested TLV %nesting_handle, must be called
   symmetric to RTA_NEST(). Returns skb->len

 RTA_NEST_CANCEL(skb, nesting_handle)
   Cancel the nested TLV %nesting_handle and trim nested TLV
   from skb again, returns -1.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETLINK]: New message building macros
Thomas Graf [Sun, 19 Jun 2005 05:50:12 +0000 (22:50 -0700)] 
[NETLINK]: New message building macros

 NLMSG_PUT_ANSWER(skb, nlcb, type, length)
   Start a new netlink message as answer to a request,
   returns the message header.

 NLMSG_END(skb, nlh)
   End a netlink message, fixes total message length,
   returns skb->len.

 NLMSG_CANCEL(skb, nlh)
   Cancel the building process and trim whole message
   from skb again, returns -1.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: Move sysctl_max_syn_backlog into request_sock.c
David S. Miller [Sun, 19 Jun 2005 05:49:40 +0000 (22:49 -0700)] 
[NET]: Move sysctl_max_syn_backlog into request_sock.c

This fixes the CONFIG_INET=n build failure noticed
by Andrew Morton.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET] rename struct tcp_listen_opt to struct listen_sock
Arnaldo Carvalho de Melo [Sun, 19 Jun 2005 05:48:55 +0000 (22:48 -0700)] 
[NET] rename struct tcp_listen_opt to struct listen_sock

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET] Generalise tcp_listen_opt
Arnaldo Carvalho de Melo [Sun, 19 Jun 2005 05:47:59 +0000 (22:47 -0700)] 
[NET] Generalise tcp_listen_opt

This chunks out the accept_queue and tcp_listen_opt code and moves
them to net/core/request_sock.c and include/net/request_sock.h, to
make it useful for other transport protocols, DCCP being the first one
to use it.

Next patches will rename tcp_listen_opt to accept_sock and remove the
inline tcp functions that just call a reqsk_queue_ function.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET] Rename open_request to request_sock
Arnaldo Carvalho de Melo [Sun, 19 Jun 2005 05:47:21 +0000 (22:47 -0700)] 
[NET] Rename open_request to request_sock

Ok, this one just renames some stuff to have a better namespace and to
dissassociate it from TCP:

struct open_request  -> struct request_sock
tcp_openreq_alloc    -> reqsk_alloc
tcp_openreq_free     -> reqsk_free
tcp_openreq_fastfree -> __reqsk_free

With this most of the infrastructure closely resembles a struct
sock methods subset.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET] Generalise TCP's struct open_request minisock infrastructure
Arnaldo Carvalho de Melo [Sun, 19 Jun 2005 05:46:52 +0000 (22:46 -0700)] 
[NET] Generalise TCP's struct open_request minisock infrastructure

Kept this first changeset minimal, without changing existing names to
ease peer review.

Basicaly tcp_openreq_alloc now receives the or_calltable, that in turn
has two new members:

->slab, that replaces tcp_openreq_cachep
->obj_size, to inform the size of the openreq descendant for
  a specific protocol

The protocol specific fields in struct open_request were moved to a
class hierarchy, with the things that are common to all connection
oriented PF_INET protocols in struct inet_request_sock, the TCP ones
in tcp_request_sock, that is an inet_request_sock, that is an
open_request.

I.e. this uses the same approach used for the struct sock class
hierarchy, with sk_prot indicating if the protocol wants to use the
open_request infrastructure by filling in sk_prot->rsk_prot with an
or_calltable.

Results? Performance is improved and TCP v4 now uses only 64 bytes per
open request minisock, down from 96 without this patch :-)

Next changeset will rename some of the structs, fields and functions
mentioned above, struct or_calltable is way unclear, better name it
struct request_sock_ops, s/struct open_request/struct request_sock/g,
etc.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SLAB] Introduce kmem_cache_name
Arnaldo Carvalho de Melo [Sun, 19 Jun 2005 05:46:19 +0000 (22:46 -0700)] 
[SLAB] Introduce kmem_cache_name

This is for use with slab users that pass a dynamically allocated slab name in
kmem_cache_create, so that before destroying the slab one can retrieve the name
and free its memory.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPSEC] Use NLMSG_LENGTH in xfrm_exp_state_notify
Jamal Hadi Salim [Sun, 19 Jun 2005 05:45:56 +0000 (22:45 -0700)] 
[IPSEC] Use NLMSG_LENGTH in xfrm_exp_state_notify

Small fixup to use netlink macros instead of hardcoding.

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPSEC] Fix xfrm_state leaks in error path
Patrick McHardy [Sun, 19 Jun 2005 05:45:31 +0000 (22:45 -0700)] 
[IPSEC] Fix xfrm_state leaks in error path

Herbert Xu wrote:
> @@ -1254,6 +1326,7 @@ static int pfkey_add(struct sock *sk, st
>       if (IS_ERR(x))
>               return PTR_ERR(x);
>
> +     xfrm_state_hold(x);

This introduces a leak when xfrm_state_add()/xfrm_state_update()
fail. We hold two references (one from xfrm_state_alloc(), one
from xfrm_state_hold()), but only drop one. We need to take the
reference because the reference from xfrm_state_alloc() can
be dropped by __xfrm_state_delete(), so the fix is to drop both
references on error. Same problem in xfrm_user.c.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPSEC] Use XFRM_MSG_* instead of XFRM_SAP_*
Herbert Xu [Sun, 19 Jun 2005 05:44:37 +0000 (22:44 -0700)] 
[IPSEC] Use XFRM_MSG_* instead of XFRM_SAP_*

This patch removes XFRM_SAP_* and converts them over to XFRM_MSG_*.
The netlink interface is meant to map directly onto the underlying
xfrm subsystem.  Therefore rather than using a new independent
representation for the events we can simply use the existing ones
from xfrm_user.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
19 years ago[IPSEC] Set byid for km_event in xfrm_get_policy
Herbert Xu [Sun, 19 Jun 2005 05:44:18 +0000 (22:44 -0700)] 
[IPSEC] Set byid for km_event in xfrm_get_policy

This patch fixes policy deletion in xfrm_user so that it sets
km_event.data.byid.  This puts xfrm_user on par with what af_key
does in this case.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
19 years ago[IPSEC] Turn km_event.data into a union
Herbert Xu [Sun, 19 Jun 2005 05:44:00 +0000 (22:44 -0700)] 
[IPSEC] Turn km_event.data into a union

This patch turns km_event.data into a union.  This makes code that
uses it clearer.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
19 years ago[IPSEC] Fix xfrm to pfkey SA state conversion
Herbert Xu [Sun, 19 Jun 2005 05:43:43 +0000 (22:43 -0700)] 
[IPSEC] Fix xfrm to pfkey SA state conversion

This patch adjusts the SA state conversion in af_key such that
XFRM_STATE_ERROR/XFRM_STATE_DEAD will be converted to SADB_STATE_DEAD
instead of SADB_STATE_DYING.

According to RFC 2367, SADB_STATE_DYING SAs can be turned into
mature ones through updating their lifetime settings.  Since SAs
which are in the states XFRM_STATE_ERROR/XFRM_STATE_DEAD cannot
be resurrected, this value is unsuitable.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
19 years ago[IPSEC] Kill spurious hard expire messages
Herbert Xu [Sun, 19 Jun 2005 05:43:22 +0000 (22:43 -0700)] 
[IPSEC] Kill spurious hard expire messages

This patch ensures that the hard state/policy expire notifications are
only sent when the state/policy is successfully removed from their
respective tables.

As it is, it's possible for a state/policy to both expire through
reaching a hard limit, as well as being deleted by the user.

Note that this behaviour isn't actually forbidden by RFC 2367.
However, it is a quality of implementation issue.

As an added bonus, the restructuring in this patch will help
eventually in moving the expire notifications from softirq
context into process context, thus improving their reliability.

One important side-effect from this change is that SAs reaching
their hard byte/packet limits are now deleted immediately, just
like SAs that have reached their hard time limits.

Previously they were announced immediately but only deleted after
30 seconds.

This is bad because it prevents the system from issuing an ACQUIRE
command until the existing state was deleted by the user or expires
after the time is up.

In the scenario where the expire notification was lost this introduces
a 30 second delay into the system for no good reason.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
19 years ago[IPSEC] Add complete xfrm event notification
Jamal Hadi Salim [Sun, 19 Jun 2005 05:42:13 +0000 (22:42 -0700)] 
[IPSEC] Add complete xfrm event notification

Heres the final patch.
What this patch provides

- netlink xfrm events
- ability to have events generated by netlink propagated to pfkey
  and vice versa.
- fixes the acquire lets-be-happy-with-one-success issue

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Sat, 18 Jun 2005 23:06:50 +0000 (16:06 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm

19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6
Linus Torvalds [Sat, 18 Jun 2005 20:54:12 +0000 (13:54 -0700)] 
Merge /pub/scm/linux/kernel/git/dwmw2/audit-2.6

19 years ago[PATCH] DocBook: MAINTAINER entry
Martin Waitz [Fri, 17 Jun 2005 20:20:59 +0000 (13:20 -0700)] 
[PATCH] DocBook: MAINTAINER entry

Martin can maintain the DocBook system for us.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] console blanking oops fix
Jan Beulich [Fri, 17 Jun 2005 20:20:58 +0000 (13:20 -0700)] 
[PATCH] console blanking oops fix

When significant delays happen during boot (e.g.  with a kernel debugger,
but the problem has also seen in other cases) the timeout for blanking the
console may trigger, but the work scheduler may not have been initialized,
yet.  schedule_work() will oops over the null keventd_wq.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMerge 'upstream-2.6.13' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Sat, 18 Jun 2005 20:08:39 +0000 (13:08 -0700)] 
Merge 'upstream-2.6.13' branch of /linux/kernel/git/jgarzik/libata-dev

19 years agoClean up subthread exec
Linus Torvalds [Sat, 18 Jun 2005 20:06:22 +0000 (13:06 -0700)] 
Clean up subthread exec

Make sure we re-parent itimers, and use BUG_ON() instead of an explicit
conditional BUG().

19 years ago[PATCH] Fix typo in drivers/pci/pci-driver.c
Mika Kukkonen [Sat, 18 Jun 2005 19:49:56 +0000 (22:49 +0300)] 
[PATCH] Fix typo in drivers/pci/pci-driver.c

The git commit 794f5bfa77955c4455f6d72d8b0e2bee25f1ff0c
accidentally suffers from a previous typo in that file
(',' instead of ';' in end of line). Patch included.

Signed-off-by: Mika Kukkonen (mikukkon@iki.fi)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoManual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev...
Linus Torvalds [Sat, 18 Jun 2005 18:42:35 +0000 (11:42 -0700)] 
Manual merge of /linux/kernel/git/jgarzik/netdev-2.6.git

This is a fixed-up version of the broken "upstream-2.6.13" branch, where
I re-did the manual merge of drivers/net/r8169.c by hand, and made sure
the history is all good.

19 years agoMerge /spare/repo/linux-2.6/
Jeff Garzik [Sat, 18 Jun 2005 17:21:24 +0000 (13:21 -0400)] 
Merge /spare/repo/linux-2.6/

19 years agoMerge with ../linux-2.6-smp
Russell King [Sat, 18 Jun 2005 08:06:59 +0000 (09:06 +0100)] 
Merge with ../linux-2.6-smp

19 years agoMerge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
David Woodhouse [Sat, 18 Jun 2005 07:36:46 +0000 (08:36 +0100)] 
Merge ... /linux/kernel/git/torvalds/linux-2.6.git

19 years ago[SCSI] Add DMA mask constants other than 32 and 64 bit
Lee Revell [Wed, 15 Jun 2005 18:19:03 +0000 (14:19 -0400)] 
[SCSI] Add DMA mask constants other than 32 and 64 bit

Signed-Off-By: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] aacraid: regression fix
Mark Haverkamp [Fri, 17 Jun 2005 20:38:04 +0000 (13:38 -0700)] 
[SCSI] aacraid: regression fix

The fixes for sparse warnings mixed in with the fixups for
the raw_srb handler resulted in a bug that showed up in the 32 bit
environments when trying to issue calls directly to the physical devices
that are part of the arrays (ioctl scsi passthrough).

Received from Mark Salyzyn at adaptec.
Applied comment from Christoph to remove cpu_to_le32(0)
Applied Mark S fix of missing memcpy.
It applies to the scsi-misc-2.6 git tree.

Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years agomerge by hand (qla_os.c mismerge)
James Bottomley [Sat, 18 Jun 2005 00:04:18 +0000 (19:04 -0500)] 
merge by hand (qla_os.c mismerge)

19 years agomerge by hand (fix up qla_os.c merge error)
James Bottomley [Fri, 17 Jun 2005 23:42:23 +0000 (18:42 -0500)] 
merge by hand (fix up qla_os.c merge error)

19 years agoLinux 2.6.12 v2.6.12
Linus Torvalds [Fri, 17 Jun 2005 19:48:29 +0000 (12:48 -0700)] 
Linux 2.6.12

19 years agoMerge 'for-linus' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/axboe...
Linus Torvalds [Fri, 17 Jun 2005 19:35:26 +0000 (12:35 -0700)] 
Merge 'for-linus' branch of /linux/kernel/git/axboe/linux-2.6-block

19 years ago[PATCH] PCI: don't override drv->shutdown unconditionally
Christoph Hellwig [Fri, 17 Jun 2005 19:25:25 +0000 (12:25 -0700)] 
[PATCH] PCI: don't override drv->shutdown unconditionally

There are many drivers that have been setting the generic driver
model level shutdown callback, and pci thus must not override it.

Without this patch we can have really bad data loss on various
raid controllers.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[SCSI] allow sleeping in ->eh_host_reset_handler()
Jeff Garzik [Sat, 28 May 2005 11:57:14 +0000 (07:57 -0400)] 
[SCSI] allow sleeping in ->eh_host_reset_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] allow sleeping in ->eh_bus_reset_handler()
Jeff Garzik [Sat, 28 May 2005 11:56:31 +0000 (07:56 -0400)] 
[SCSI] allow sleeping in ->eh_bus_reset_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] allow sleeping in ->eh_device_reset_handler()
Jeff Garzik [Sat, 28 May 2005 11:55:48 +0000 (07:55 -0400)] 
[SCSI] allow sleeping in ->eh_device_reset_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] allow sleeping in ->eh_abort_handler()
Jeff Garzik [Sat, 28 May 2005 11:54:40 +0000 (07:54 -0400)] 
[SCSI] allow sleeping in ->eh_abort_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] Remove no-op implementations of SCSI EH hooks
Jeff Garzik [Sat, 28 May 2005 11:52:51 +0000 (07:52 -0400)] 
[SCSI] Remove no-op implementations of SCSI EH hooks

Drivers need not implement a hook that returns FAILED, and does nothing
else, since the SCSI midlayer code will do that for us.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] Remove unnecessary locking around completion function calls
Jeff Garzik [Sat, 28 May 2005 11:47:39 +0000 (07:47 -0400)] 
[SCSI] Remove unnecessary locking around completion function calls

The SCSI ->done() hook should not be called from inside a spinlock.

Drivers that do this are mostly cut-n-paste from 2.2.x-era.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[PATCH] timer exit cleanup
Ingo Molnar [Fri, 17 Jun 2005 09:36:36 +0000 (11:36 +0200)] 
[PATCH] timer exit cleanup

Do all timer zapping in exit_itimers.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoWhen cfq I/O scheduler is selected, get_request() in __make_request() calls
Kiyoshi Ueda [Fri, 17 Jun 2005 14:15:10 +0000 (16:15 +0200)] 
When cfq I/O scheduler is selected, get_request() in __make_request() calls
__cfq_get_queue().  __cfq_get_queue() finds an existing queue (struct
cfq_queue) of the current process for the device and returns it.  If it's not
found, __cfq_get_queue() creates and returns a new one if __cfq_get_queue() is
called with __GFP_WAIT flag, or __cfq_get_queue() returns NULL (this means that
get_request() fails) if no __GFP_WAIT flag.

On the other hand, in __make_request(), get_request() is called without
__GFP_WAIT flag at the first time.  Thus, the get_request() fails when there is
no existing queue, typically when it's called for the first I/O request of the
process to the device.

Though it will be followed by get_request_wait() for general case,
__make_request() will just end the I/O with an error (EWOULDBLOCK) when the
request was for read-ahead.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 16 Jun 2005 20:40:39 +0000 (13:40 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm

19 years ago[PATCH] ARM: 2715/1: restore CPLD interrupts upon resume for Lubbock and Mainstone
Nicolas Pitre [Thu, 16 Jun 2005 20:23:56 +0000 (21:23 +0100)] 
[PATCH] ARM: 2715/1: restore CPLD interrupts upon resume for Lubbock and Mainstone

Patch from Nicolas Pitre

Without this some devices fail to work again after a suspend event.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 16 Jun 2005 20:22:23 +0000 (13:22 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm

19 years ago[PATCH] ARM: 2714/1: Fix the IB2 definitions for the Versatile platform
Catalin Marinas [Thu, 16 Jun 2005 17:01:12 +0000 (18:01 +0100)] 
[PATCH] ARM: 2714/1: Fix the IB2 definitions for the Versatile platform

Patch from Catalin Marinas

The initial IB2 addresses did not depend on the IB2 base. This
patch defines them as (VERSATILE_IB2_BASE + offset).

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2713/1: Fix the GPIO base for Integrator/CP
Catalin Marinas [Thu, 16 Jun 2005 17:01:11 +0000 (18:01 +0100)] 
[PATCH] ARM: 2713/1: Fix the GPIO base for Integrator/CP

Patch from Catalin Marinas

The GPIO base for Integrator/CP is different from the
Integrator/AP. This patch sets the correct value for
INTEGRATOR_GPIO_BASE.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2712/1: Fix the RGB order for the Versatile CLCD
Catalin Marinas [Thu, 16 Jun 2005 17:01:11 +0000 (18:01 +0100)] 
[PATCH] ARM: 2712/1: Fix the RGB order for the Versatile CLCD

Patch from Catalin Marinas

The current red and blue colours on the Versatile CLCD are
reversed when the 5:6:5 mode is used. The patch sets the proper
bit in the SYS_CLCD register value.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years agoMerge 'for-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/axboe/linux...
Linus Torvalds [Thu, 16 Jun 2005 16:53:48 +0000 (09:53 -0700)] 
Merge 'for-linus' branch of /linux/kernel/git/axboe/linux-2.6-block

19 years ago[PATCH] fix for kaweth broken by changes in the networking layer
Oliver Neukum [Thu, 16 Jun 2005 05:26:38 +0000 (22:26 -0700)] 
[PATCH] fix for kaweth broken by changes in the networking layer

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ALPS: fix enabling hardware tapping
Dmitry Torokhov [Thu, 16 Jun 2005 05:26:36 +0000 (22:26 -0700)] 
[PATCH] ALPS: fix enabling hardware tapping

It looks like logic for enabling hardware tapping in ALPS driver was
inverted and we enable it only if it was already enabled by BIOS or
firmware.

I have a confirmation from one user that the patch below fixes the problem
for him and it might be beneficial if we could get it into 2.6.12.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix large core dumps with a 32-bit off_t
Daniel Jacobowitz [Thu, 16 Jun 2005 05:26:34 +0000 (22:26 -0700)] 
[PATCH] Fix large core dumps with a 32-bit off_t

The ELF core dump code has one use of off_t when writing out segments.
Some of the segments may be passed the 2GB limit of an off_t, even on a
32-bit system, so it's important to use loff_t instead.  This fixes a
corrupted core dump in the bigcore test in GDB's testsuite.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] sbp2 slab corruption fix
Alexandre Oliva [Thu, 16 Jun 2005 05:26:31 +0000 (22:26 -0700)] 
[PATCH] sbp2 slab corruption fix

This fixed a problem that showed up in the Fedora development tree a few
weeks before the Fedora Core 4 release, initially as slab corruption, later
as hard crashes on boot up, when slab debugging was disabled for the
release.  More details on the history at
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158424

The problem is caused by sbp2's use of scsi_host->hostdata[0] to hold a
scsi_id, without explicitly requesting space for it.  Since hostdata is
declared as a zero-sized array, we don't get any such space by default, so
it must be explicitly requested.  The patch below implements just that.

Signed-off-by: Alexandre Oliva <aoliva@redhat.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago This patch fixes q->unplug_thresh condition check in
Tejun Heo [Thu, 16 Jun 2005 10:57:31 +0000 (12:57 +0200)] 
 This patch fixes q->unplug_thresh condition check in
__elv_add_request().  rq.count[READ] + rq.count[WRITE] can increase
more than one if another thread has allocated a request after the
current request is allocated or in_flight could have changed resulting
in larger-than-one change of nrq, thus breaking the threshold
mechanism.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Tejun Heo <htejun@gmail.com>
19 years agoThis patch kills elevator_global_init() in elevator.c which does
Tejun Heo [Thu, 16 Jun 2005 10:56:15 +0000 (12:56 +0200)] 
This patch kills elevator_global_init() in elevator.c which does
nothing.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Tejun Heo <htejun@gmail.com>
19 years ago[NETFILTER]: ipt_recent: last_pkts is an array of "unsigned long" not "u_int32_t"
David S. Miller [Thu, 16 Jun 2005 03:51:14 +0000 (20:51 -0700)] 
[NETFILTER]: ipt_recent: last_pkts is an array of "unsigned long" not "u_int32_t"

This fixes various crashes on 64-bit when using this module.

Based upon a patch by Juergen Kreileder <jk@blackdown.de>.

Signed-off-by: David S. Miller <davem@davemloft.net>
ACKed-by: Patrick McHardy <kaber@trash.net>
19 years ago[PATCH] update ppc64 defconfig
Olaf Hering [Tue, 14 Jun 2005 20:52:19 +0000 (13:52 -0700)] 
[PATCH] update ppc64 defconfig

enable cpusets
enable new lpfc and jsm drivers
enable new dm-multipath
leave new agp disabled
disable rivafb, it does not handle the cards in G5 models (FX5200 as example)
the new nvidiafb doesnt work on bigendian, yet

Signed-off-by: Olaf Hering <olh@suse.de>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ppc64: update example configs
Paul Mackerras [Tue, 14 Jun 2005 12:19:24 +0000 (22:19 +1000)] 
[PATCH] ppc64: update example configs

Here is a patch to update the example configs in arch/ppc64/configs.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] usbusx2y: prevent oops & dead keyboard on usb unplugging while the device...
Karsten Wiese [Tue, 14 Jun 2005 16:56:20 +0000 (09:56 -0700)] 
[PATCH] usbusx2y: prevent oops & dead keyboard on usb unplugging while the device is being used

Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's.  This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed.  The patch ensures the correct sequence.  Tested ok on
kernel 2.6.12-rc2.

Present in ALSA cvs

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device...
Karsten Wiese [Tue, 14 Jun 2005 16:54:55 +0000 (09:54 -0700)] 
[PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used

Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's.  This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed.  The patch ensures the correct sequence.  Tested ok on
kernel 2.6.12-rc2.

Present in ALSA cvs

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] macmodes: needs a license
Randy Dunlap [Tue, 14 Jun 2005 05:58:09 +0000 (22:58 -0700)] 
[PATCH] macmodes: needs a license

Module needs a license to prevent kernel tainting.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] apm.c: ignore_normal_resume is set a bit too late
Thomas Hood [Tue, 14 Jun 2005 05:58:04 +0000 (22:58 -0700)] 
[PATCH] apm.c: ignore_normal_resume is set a bit too late

This patch causes the ignore_normal_resume flag to be set slightly earlier,
before there is a chance that the apm driver will receive the normal resume
event from the BIOS.  (Addresses Debian bug #310865)

Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] i2o: Fix free of event memory in i2o_block_event()
Markus Lidel [Tue, 14 Jun 2005 05:58:00 +0000 (22:58 -0700)] 
[PATCH] i2o: Fix free of event memory in i2o_block_event()

Fixed freeing of event memory in i2o_block_event()

Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Typo in fbdev sysfs support, virtual_size
Jon Smirl [Mon, 13 Jun 2005 22:52:36 +0000 (15:52 -0700)] 
[PATCH] Typo in fbdev sysfs support, virtual_size

It prints out x,x instead of x,y.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@hotpop.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] cond_resched_lock() fix
Jan Kara [Mon, 13 Jun 2005 22:52:32 +0000 (15:52 -0700)] 
[PATCH] cond_resched_lock() fix

On one path, cond_resched_lock() fails to return true if it dropped the lock.
We think this might be causing the crashes in JBD's log_do_checkpoint().

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Fix PCI BAR size interpretation on 64-bit arches
Olof Johansson [Mon, 13 Jun 2005 22:52:27 +0000 (15:52 -0700)] 
[PATCH] Fix PCI BAR size interpretation on 64-bit arches

On 64-bit machines, PCI_BASE_ADDRESS_MEM_MASK and other mask constants
passed to pci_size() are 64-bit (for example ~0x0fUL).  However, pci_size
does comparisons between the u32 arguments and the mask, which will fail
even though any result from pci_size is still just 32-bit.

Changing the mask argument to u32 seems the obvious thing to do, since all
arithmetic in the function is 32-bit and having a larger mask makes no
sense.

This triggered on a PPC64 system here where an adapter (VGA, as it
happened) had a memory region base of 0xfe000000 and a sz of the same,
matching the if (max == maxbase ...) test at the bottom of pci_size but
failing the mask comparison.  Quite a corner case which I guess explains
why we haven't seen it until now.

Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] uml: slirp and slip driver cleanups and fixes
Jeff Dike [Mon, 13 Jun 2005 22:52:18 +0000 (15:52 -0700)] 
[PATCH] uml: slirp and slip driver cleanups and fixes

This patch merges a lot of duplicated code in the slip and slirp drivers,
abstracts out the slip protocol, and makes the slip driver work in 2.6.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] uml: use fork instead of clone
Jeff Dike [Mon, 13 Jun 2005 22:52:14 +0000 (15:52 -0700)] 
[PATCH] uml: use fork instead of clone

Convert the boot-time host ptrace testing from clone to fork.  They were
essentially doing fork anyway.  This cleans up the code a bit, and makes
valgrind a bit happier about grinding it.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] uml: build cleanups
Jeff Dike [Mon, 13 Jun 2005 22:52:10 +0000 (15:52 -0700)] 
[PATCH] uml: build cleanups

Fix a build failure when CONFIG_MODE_SKAS is disabled and make a Makefile
comment fit in 80 columns.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] uml: remove duplicate includes
Jeff Dike [Mon, 13 Jun 2005 22:52:04 +0000 (15:52 -0700)] 
[PATCH] uml: remove duplicate includes

A few files include the same header twice.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[SCSI] aic7xxx: fix the BIOS limits setting routines
James Bottomley [Tue, 14 Jun 2005 01:58:56 +0000 (20:58 -0500)] 
[SCSI] aic7xxx: fix the BIOS limits setting routines

Following the go around over the SONY DVD that needs artificial limits,
this should be the correct code for all cases (minus the debugging
prints).

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix handling of port boxed and lun boxed fsf states
Andreas Herrmann [Mon, 13 Jun 2005 11:23:57 +0000 (13:23 +0200)] 
[SCSI] zfcp: fix handling of port boxed and lun boxed fsf states

From: Maxim Shchetynin <maxim@de.ibm.com>

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix module parameter parsing
Andreas Herrmann [Mon, 13 Jun 2005 11:22:25 +0000 (13:22 +0200)] 
[SCSI] zfcp: fix module parameter parsing

From: Heiko Carstens <heiko.carstens@de.ibm.com>

Fixes module parameter parsing for "device" parameter.  The original
module parameter was changed while parsing it.  This corrupted the
output in sysfs (/sys/module/zfcp/parameters/device).

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix bug during adapter shutdown
Andreas Herrmann [Mon, 13 Jun 2005 11:20:35 +0000 (13:20 +0200)] 
[SCSI] zfcp: fix bug during adapter shutdown

Fixes a race between zfcp_fsf_req_dismiss_all and
zfcp_qdio_reqid_check. During adapter shutdown it occurred that a
request was cleaned up twice. First during its normal
completion. Second when dismiss_all was called.  The fix is to
serialize access to fsf request list between zfcp_fsf_req_dismiss_all
and zfcp_qdio_reqid_check and delete a fsf request from the list if
its completion is triggered.  (Additionally a rwlock was replaced by a
spinlock and fsf_req_cleanup was eliminated.)

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix: problem in send_els_handler when D_ID assignment changes
Andreas Herrmann [Mon, 13 Jun 2005 11:18:56 +0000 (13:18 +0200)] 
[SCSI] zfcp: fix: problem in send_els_handler when D_ID assignment changes

From: Maxim Shchetynin <maxim@de.ibm.com>

Fixes a bug in zfcp_send_els_handler.  If D_ID assignments for ports
are changing between initiation of one ELS request and its completion
the wrong port might be accessed in the completion for that ELS
request. Thus a pointer to the port has to be passed for ELS requests
to identify the port structure if required.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix: mark fsf request failed when receiving unknown status qualifier
Andreas Herrmann [Mon, 13 Jun 2005 11:17:44 +0000 (13:17 +0200)] 
[SCSI] zfcp: fix: mark fsf request failed when receiving unknown status qualifier

From: Maxim Shchetynin <maxim@de.ibm.com>

Correct a bug in zfcp_fsf_send_fcp_command_handler.  An fsf request
was not marked as failed if an unknown status qualifier was returned.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix: reopen port only if link-test fails
Andreas Herrmann [Mon, 13 Jun 2005 11:16:27 +0000 (13:16 +0200)] 
[SCSI] zfcp: fix: reopen port only if link-test fails

From: Maxim Shchetynin <maxim@de.ibm.com>

Reopen a remote port only if the link-test fails. This avoids that a
port is unnecessarily reopened.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix: allow more time for adapter initialization
Andreas Herrmann [Mon, 13 Jun 2005 11:15:15 +0000 (13:15 +0200)] 
[SCSI] zfcp: fix: allow more time for adapter initialization

From: Maxim Shchetynin <maxim@de.ibm.com>

Extend the time for adapter initialization: In case of protocol
status HOST_CONNECTION_INITIALIZING for the exchange config data
command do a first retry in 1 second, then double the sleep time for
each following retry until recovery exceeds 2 minutes. The old
behaviour of allowing 6 retries with .5 seconds delay between retries
was insufficient and qdio queues were shut down too erarly.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years ago[SCSI] zfcp: fix wrong handling of failed requests for GID_PN command
Andreas Herrmann [Mon, 13 Jun 2005 11:13:45 +0000 (13:13 +0200)] 
[SCSI] zfcp: fix wrong handling of failed requests for GID_PN command

Fixes the handling of failed requests for GID_PN nameserver command:
Set ZFCP_STATUS_PORT_INVALID_WWPN only if indicated by response
payload for GID_PN nameserver command and not if fsf request fails.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
19 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 14 Jun 2005 01:49:44 +0000 (18:49 -0700)] 
Merge /pub/scm/linux/kernel/git/davem/net-2.6

19 years ago[NETFILTER]: Advance seq-file position in exp_next_seq()
Patrick McHardy [Tue, 14 Jun 2005 01:27:13 +0000 (18:27 -0700)] 
[NETFILTER]: Advance seq-file position in exp_next_seq()

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years agoUpdate DCO ("signoff") rules to 1.1
Linus Torvalds [Tue, 14 Jun 2005 00:51:55 +0000 (17:51 -0700)] 
Update DCO ("signoff") rules to 1.1

This adds a clause that notes explicitly that the person doing the
sign-off knows that the project (and his sign-off) is public and will
possibly get archived and re-distributed.

19 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 13 Jun 2005 23:24:01 +0000 (16:24 -0700)] 
Merge /pub/scm/linux/kernel/git/davem/net-2.6

19 years ago[IPV4]: Sysctl configurable icmp error source address.
J. Simonetti [Mon, 13 Jun 2005 22:19:03 +0000 (15:19 -0700)] 
[IPV4]: Sysctl configurable icmp error source address.

This patch alows you to change the source address of icmp error
messages. It applies cleanly to 2.6.11.11 and retains the default
behaviour.

In the old (default) behaviour icmp error messages are sent with the ip
of the exiting interface.

The new behaviour (when the sysctl variable is toggled on), it will send
the message with the ip of the interface that received the packet that
caused the icmp error. This is the behaviour network administrators will
expect from a router. It makes debugging complicated network layouts
much easier. Also, all 'vendor routers' I know of have the later
behaviour.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SCTP] Fix incorrect setting of sk_bound_dev_if when binding/sending to a ipv6
Sridhar Samudrala [Mon, 13 Jun 2005 22:13:05 +0000 (15:13 -0700)] 
[SCTP] Fix incorrect setting of sk_bound_dev_if when binding/sending to a ipv6
link local address.

Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SCTP] Add support for ip_nonlocal_bind sysctl & IP_FREEBIND socket option
Neil Horman [Mon, 13 Jun 2005 22:12:33 +0000 (15:12 -0700)] 
[SCTP] Add support for ip_nonlocal_bind sysctl & IP_FREEBIND socket option

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SCTP] Extend the info exported via /proc/net/sctp to support netstat for SCTP.
Vladislav Yasevich [Mon, 13 Jun 2005 22:11:57 +0000 (15:11 -0700)] 
[SCTP] Extend the info exported via /proc/net/sctp to support netstat for SCTP.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SCTP] Support SO_BINDTODEVICE socket option on incoming packets.
Neil Horman [Mon, 13 Jun 2005 22:11:24 +0000 (15:11 -0700)] 
[SCTP] Support SO_BINDTODEVICE socket option on incoming packets.

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SCTP]: Fix bug in restart of peeled-off associations.
Vladislav Yasevich [Mon, 13 Jun 2005 22:10:49 +0000 (15:10 -0700)] 
[SCTP]: Fix bug in restart of peeled-off associations.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPv6] Don't generate temporary for TUN devices
Rémi Denis-Courmont [Mon, 13 Jun 2005 22:01:34 +0000 (15:01 -0700)] 
[IPv6] Don't generate temporary for TUN devices

Userland layer-2 tunneling devices allocated through the TUNTAP driver
(drivers/net/tun.c) have a type of ARPHRD_NONE, and have no link-layer
address. The kernel complains at regular interval when IPv6 Privacy
extension are enabled because it can't find an hardware address :

Dec 29 11:02:04 auguste kernel: __ipv6_regen_rndid(idev=cb3e0c00):
cannot get EUI64 identifier; use random bytes.

IPv6 Privacy extensions should probably be disabled on that sort of
device. They won't work anyway. If userland wants a more usual
Ethernet-ish interface with usual IPv6 autoconfiguration, it will use a
TAP device with an emulated link-layer  and a random hardware address
rather than a TUN device.

As far as I could fine, TUN virtual device from TUNTAP is the very only
sort of device using ARPHRD_NONE as kernel device type.

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV6]: Ensure to use icmpv6_socket in non-preemptive context.
YOSHIFUJI Hideaki [Mon, 13 Jun 2005 21:59:44 +0000 (14:59 -0700)] 
[IPV6]: Ensure to use icmpv6_socket in non-preemptive context.

We saw following trace several times:

|BUG: using smp_processor_id() in preemptible [00000001] code: httpd/30137
|caller is icmpv6_send+0x23/0x540
| [<c01ad63b>] smp_processor_id+0x9b/0xb8
| [<c02993e7>] icmpv6_send+0x23/0x540

This is because of icmpv6_socket, which is the only one user of
smp_processor_id() in icmpv6_send(), AFAIK.

Since it should be used in non-preemptive context,
let's defer the dereference after disabling preemption
(by icmpv6_xmit_lock()).

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 13 Jun 2005 21:47:47 +0000 (14:47 -0700)] 
Merge master.kernel.org:/home/rmk/linux-2.6-arm

19 years ago[PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n
Nicolas Pitre [Mon, 13 Jun 2005 21:35:41 +0000 (22:35 +0100)] 
[PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n

Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>