Removes old generic unused rate estimator bits. HTB has its own
rate estimator routines and therefore no rate estimator is created
so there is no need to try and delete one. We might want to convert
it to the generic rate estimator at a later point.
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Thomas Graf [Thu, 21 Oct 2004 15:25:28 +0000 (08:25 -0700)]
[PKT_SCHED]: Add dump_stats class op
Adds a new class operation dump_stats which classes can use
to dump statistics. Unlike in qdiscs, there are no common
statistics therefore classes must dump all statistics on their
own. The qdisc stats_lock is being used for locking.
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Thomas Graf [Thu, 21 Oct 2004 15:23:26 +0000 (08:23 -0700)]
[PKT_SCHED]: Add dump_stats qdisc op
Adds a new qdisc operation dump_stats which qdiscs can use
to dump statistics. The op is invoked between gnet_stats_start_copy
and gnet_stats_finish_copy and therefore stats_lock is already
held. This is required to ensure proper locking throughout the
whole statistic dumping procedure.
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Jean Tourrilhes [Thu, 21 Oct 2004 15:19:51 +0000 (08:19 -0700)]
[IRDA]: Stir netdev and messages cleanups
<Patch from Stephen Hemminger>
o [FEATURE] stir4200: netdev_priv and message cleanup
Stir4200 driver cleanup's:
* use netdev_priv
* make sure messages identify the driver
* get rid of unneeded message
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Jean Tourrilhes [Thu, 21 Oct 2004 15:18:49 +0000 (08:18 -0700)]
[IRDA]: Stir driver suspend fix
<Patch from Stephen Hemminger>
o [FEATURE] stir4200: don't need suspend/resume if !CONFIG_PM
The suspend/resume code only needs to be compiled in if power management
is enabled.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Jean Tourrilhes [Thu, 21 Oct 2004 15:18:08 +0000 (08:18 -0700)]
[IRDA]: Stir driver usb reset fix
<Patch from Stephen Hemminger>
o [CORRECT] stir4200 - get rid of reset on speed change
The Sigmatel 4200 doesn't accept the address setting which gets done on
USB reset. The USB core recently changed to resend address (or
something like that), so usb_reset_device is failing.
The device works without doing the USB reset on speed change, it just
will be less robust in recovering when things get wedged (like coming
out of FIR mode).
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Jean Tourrilhes [Thu, 21 Oct 2004 15:16:53 +0000 (08:16 -0700)]
[IRDA]: Debug module param
<Patch from Stephen Hemminger>
o [CORRECT] irda 2.6 - fix module info
The module parameter info for irda is incorrect.
The debug parameter is named debug, the variable is irda_debug.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Jean Tourrilhes [Thu, 21 Oct 2004 15:16:04 +0000 (08:16 -0700)]
[IRDA]: via-ircc driver speed fixes
o [CORRECT] Speed change fixes in via-ircc driver
o [FEATURE] Add new dongle ID in via-ircc driver
o [FEATURE] Various code cleanups in via-ircc driver
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Jean Tourrilhes [Thu, 21 Oct 2004 15:09:38 +0000 (08:09 -0700)]
[IRDA]: Adaptive discovery query timer
o [FEATURE] Adapt to the rate of the peer discovery (passive discovery)
o [FEATURE] Add extra safety margin in passive discovery
Allow to interoperate properly with device performing slow discovery
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Jean Tourrilhes [Thu, 21 Oct 2004 15:06:57 +0000 (08:06 -0700)]
[IRDA]: Fix lmp_lsap_inuse()
o [CRITICA] Fix locking in error path in IrLMP (Stanford checker)
o [CORRECT] Don't reuse unconnected LSAPs (listening sockets)
o [CORRECT] Make sure the LSAP we are picking has just not been grabed
o [CORRECT] Wrap around the LSAP space properly back to 0x10
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Andrew Morton [Thu, 21 Oct 2004 14:55:58 +0000 (07:55 -0700)]
[NET]: Add new sysfs attribute 'carrier' for net devices.
From: Jesper Juhl <juhl-lkml@dif.dk>
The patch adds a new sysfs attribute called carrier for net devices that
exposes the result of netif_carrier_ok(). This allows a user to quickly
and easily determine if a given netdevice has carrier or not. Reading
/sys/class/net/<interface>/carrier yields a '1' when there is a carrier and
a '0' when there is not.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
[NET]: Replace dst_release refcount error with standard WARN_ON
Replace the dst count underflow bug message with a standard WARN message.
This makes errors noticeable and also reduces the kernel text size by 600
since we aren't doing as much to setup the printk.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Andrew Morton [Wed, 20 Oct 2004 15:04:24 +0000 (08:04 -0700)]
[NETFILTER]: Avoid warning on CONNTRACK_STAT_INC in death_by_timeout()
Module removal can call death_by_timeout() manually, which isn't in softirq
context, so the CONNTRACK_STAT_INC() call there (which assumes preempt
disabled) can give a warning. Of course, the warning here is spurious, but
the simplest workaround is to call CONNTRACK_STAT_INC() inside the lock.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Harald Welte [Wed, 20 Oct 2004 14:14:41 +0000 (07:14 -0700)]
[NETFILTER]: Add iptables CONNMARK match+target
This is the first patch, adding something similar like nfmark, but on a
per-conntrack (as opposed to per-skb) level. Very useful especially for
asymmatric routing in combination with MASQUERADE, as often found on
home DSL setups with dymamic IP address that also have e.g. a tunnel
device with static IP.
Signed-off-by: Henrik Nordstrom <hno@marasystems.com> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy [Wed, 20 Oct 2004 14:06:04 +0000 (07:06 -0700)]
[IPV6]: Fix netdevice/inet6_dev reference leaks in ip6_route_add error paths
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Jesse Barnes [Wed, 20 Oct 2004 22:53:23 +0000 (22:53 +0000)]
[IA64-SGI] more sparse I/O accessor fixes
I forgot to add 'const volatile' to the I/O read/write functions in the last
patch, and also forgot to update the _relaxed variants. This patch fixes
that by adding 'const volatile' to the sn2 specific read/write routines as
well as the ia64 machine vector wrappers.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Jesse Barnes [Wed, 20 Oct 2004 20:40:02 +0000 (20:40 +0000)]
[IA64-SGI] sparse cleanups & misc fixes for sn2
This is a big patch mostly because I trimmed shub_mmr.h down from 17M to 11k
or so. It fixes a number of things sparse discovered and removes some dead
code, fixes up some prototypes, etc. Of note:
o sn_proc_fs.c was directly dereferencing user pointers, fixed
o sn_hwperf.c was missing an include and was using asm-ia64 directly
o the I/O routines were all missing proper sparse annotations
o dead code in prominfo_proc.c has been removed
o fix generic build by putting numionodes into asm/sn/io.h
With this patch applied, the check build is pretty clean. The sn_console bit
depends on some of the other changes, so it's included here.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
John Hawkes [Wed, 20 Oct 2004 18:23:39 +0000 (18:23 +0000)]
[IA64] top level scheduler domain for ia64
Some have noticed that the overlapping sched domains code doesn't quite work
as intended (it results in disjoint domains on some machines), and that a top
level, machine spanning domain is needed. This patch from John Hawkes adds
it to the ia64 code. This allows processes to run on all CPUs in large
systems, though balancing is limited. It should go to Linus soon now
otherwise large systems will only have ~16p (depending on topology) usable by
the scheduler. I sanity checked it on a small system after rediffing John's
original, and he's done some testing on very large systems.
Nick, can you buy off on the sched.c change? Alternatively, do you want to
send that fix separately John? Nick did indeed ACK this change, but it isn't
dependent on this ia64 specific part ... so it's going to be submitted
separately.
Signed-off-by: John Hawkes <hawkes@sgi.com> Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Use PIO code from ide-taskfile.c in ide-disk.c so:
* drive status is checked after PIO read
* request is failed if invalid data phase
is detected during PIO write
Russell King [Wed, 20 Oct 2004 21:34:23 +0000 (22:34 +0100)]
[ARM] Add seqlocking to timers.
Sometimes, it's useful to have locking. Especially when we're
talking about time keeping.
It would appear that shemminger's patch of 5th February 2003
completely missed updating _ANY_ ARM timer implementations and,
because linux-arch didn't exist at the time, there appears to
have been no notification to any architecture developer that
maybe, just maybe, some work was required.
One wonders how many other changes are in the kernel which
architecture maintainers have missed.
Russell King [Wed, 20 Oct 2004 15:47:09 +0000 (16:47 +0100)]
[ARM] Cleanup some quirks.
- Ensure FIQs are enabled when cpu_idle() is called.
- Remove unused members of irq_cpustat_t.
- Remove unnecessary #ifndef CONFIG_SMP...#endif around irq_exit()
macro.
- Rename __stf/__clf such that it stresses that they affect only
local state (as per local_irq_xxx).
- Move THREAD_SIZE such that it can be used in current_thread_info()