OSDN Git Service
Roland Dreier [Mon, 27 Jun 2005 21:36:43 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Split off MTT allocation
Split allocation of MTT range from creation of MR. This will be useful for
implementing shared memory regions and userspace verbs.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Mon, 27 Jun 2005 21:36:43 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Move mthca_is_memfree checks
Make mthca_table_put() and mthca_table_put_range() NOPs if the device is not
mem-free, so that we don't have to have "if (mthca_is_memfree())" tests in the
callers of these functions. This makes our code more readable and
maintainable, and saves a couple dozen bytes of text in ib_mthca.ko as well.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Mon, 27 Jun 2005 21:36:42 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Fix memset size
Fix memset to use sizeof *props instead of just sizeof props.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Mon, 27 Jun 2005 21:36:42 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Enable unreliable connected transport
Add support for unreliable connected (UC) transport to mthca driver:
- Add attributes for UC to modify QP table.
- Add support for posting UC work requests.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Mon, 27 Jun 2005 21:36:41 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Set RDMA/atomic capabilities correctly
mthca apparently had the meanings of the max_rd_atomic and max_dest_rd_atomic
QP attributes backwards. max_rd_atomic limits the maximum number of
outstanding RDMA/atomic requests as an initiator (on a send queue), and
max_dest_rd_atomic specifies the resources allocated to handle RMDA/atomic
requests from the remote end of the connection. We were programming our QP
context with these values swapped.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Mon, 27 Jun 2005 21:36:40 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Set QP static rate correctly
Fix offset of static_rate in QP context. Pointed out by Dror Goldenberg.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Mon, 27 Jun 2005 21:36:40 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Use dma_alloc_coherent instead of pci_alloc_consistent
Switch all allocations of coherent memory from pci_alloc_consistent() to
dma_alloc_coherent(), so that we can pass GFP_KERNEL. This should help when
the system is low on memory.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier [Mon, 27 Jun 2005 21:36:39 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Clean up CQ debug
Clean up CQ debugging code: make dump_cqe print on one line, and only dump
error CQ entries for local operation errors.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bernhard Fischer [Mon, 27 Jun 2005 21:36:39 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Clean up error messages
- Fix incorrect cut-n-paste in error messages.
- Add missing newlines in error messages.
- Use DRV_NAME instead of "ib_mthca" in a couple of places.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Tom Duffy [Mon, 27 Jun 2005 21:36:37 +0000 (14:36 -0700)]
[PATCH] IB/mthca: Add Sun copyright notice
Add Sun copyright to files modified by Tom Duffy.
Signed-off-by: Tom Duffy <tduffy@sun.com>
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrea Arcangeli [Mon, 27 Jun 2005 21:36:36 +0000 (14:36 -0700)]
[PATCH] seccomp: tsc disable
I believe at least for seccomp it's worth to turn off the tsc, not just for
HT but for the L2 cache too. So it's up to you, either you turn it off
completely (which isn't very nice IMHO) or I recommend to apply this below
patch.
This has been tested successfully on x86-64 against current cogito
repository (i686 compiles so I didn't bother testing ;). People selling
the cpu through cpushare may appreciate this bit for a peace of mind.
There's no way to get any timing info anymore with this applied
(gettimeofday is forbidden of course). The seccomp environment is
completely deterministic so it can't be allowed to get timing info, it has
to be deterministic so in the future I can enable a computing mode that
does a parallel computing for each task with server side transparent
checkpointing and verification that the output is the same from all the 2/3
seller computers for each task, without the buyer even noticing (for now
the verification is left to the buyer client side and there's no
checkpointing, since that would require more kernel changes to track the
dirty bits but it'll be easy to extend once the basic mode is finished).
Eliminating a cold-cache read of the cr4 global variable will save one
cacheline during the tlb flush while making the code per-cpu-safe at the
same time. Thanks to Mikael Pettersson for noticing the tlb flush wasn't
per-cpu-safe.
The global tlb flush can run from irq (IPI calling do_flush_tlb_all) but
it'll be transparent to the switch_to code since the IPI won't make any
change to the cr4 contents from the point of view of the interrupted code
and since it's now all per-cpu stuff, it will not race. So no need to
disable irqs in switch_to slow path.
Signed-off-by: Andrea Arcangeli <andrea@cpushare.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Mon, 27 Jun 2005 21:36:35 +0000 (14:36 -0700)]
[PATCH] ppc64: Add missing exports
This patch adds a couple of missing symbol exports. flush_dcache_page is
used by the AGP driver and rtc_lock by the RTC driver.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Mon, 27 Jun 2005 21:36:34 +0000 (14:36 -0700)]
[PATCH] ppc32: Remove CONFIG_PMAC_PBOOK
This patch removes CONFIG_PMAC_PBOOK (PowerBook support). This is now
split into CONFIG_PMAC_MEDIABAY for the actual hotswap bay that some
powerbooks have, CONFIG_PM for power management related code, and just left
out of any CONFIG_* option for some generally useful stuff that can be used
on non-laptops as well.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Mon, 27 Jun 2005 21:36:33 +0000 (14:36 -0700)]
[PATCH] ppc32: remove obsolete macserial driver
The macserial driver has been obsoleted by the new pmac_zilog driver for a
while now and probably doesn't even work anymore on recent kernels. This
patch removes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Mon, 27 Jun 2005 21:36:32 +0000 (14:36 -0700)]
[PATCH] ppc32: Bump PMU interrupt priority
The Power Management Unit on PowerMacs is very sensitive to timeouts during
async message exchanges. It uses rather crude protocol based on a shift
register with an interrupt and is almost continuously exchanging messages with
the host CPU on laptops.
This patch adds a routine to the open_pic driver to be able to select a PMU
driver so that it bumps it's interrupt priority to above the normal level.
This will allow PMU interrupts to occur while another interrupt is pending,
and thus reduce the risk of machine beeing abruptly shutdown by the PMU due to
a timeout in PMU communication caused by excessive interrupt latency. The
problem is very rare, and usually just doesn't happen, but it is still useful
to make things even more robust.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Marcelo Tosatti [Mon, 27 Jun 2005 16:09:00 +0000 (13:09 -0300)]
[PATCH] 8xx: avoid "dcbst" misbehaviour with unpopulated TLB
The proposed _tlbie call at update_mmu_cache() is safe because:
Addresses for which update_mmu_cache() gets invocated are never inside the
static kernel virtual mapping, meaning that there is no risk for the
_tlbie() here to be thrashing the pinned entry, as Dan suspected.
The intermediate TLB state in which this bug can be triggered is not
visible by userspace or any other contexts, except the page fault handling
path. So there is no need to worry about userspace dcbxxx users.
The other solution to this is to avoid dcbst misbehaviour in the first
place, which involves changing in-kernel "dcbst" callers to use 8xx
specific SPR's.
Summary:
On 8xx, cache control instructions (particularly "dcbst" from
flush_dcache_icache) fault as write operation if there is an unpopulated
TLB entry for the address in question. To workaround that, we invalidate
the TLB here, thus avoiding dcbst misbehaviour.
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Yoichi Yuasa [Mon, 27 Jun 2005 21:36:30 +0000 (14:36 -0700)]
[PATCH] mips: fixed try_to_freeze build error
arch/mips/kernel/signal.c: In function 'do_signal':
arch/mips/kernel/signal.c:460: error: too many arguments to function 'try_to_freeze'
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bob Picco [Mon, 27 Jun 2005 21:36:28 +0000 (14:36 -0700)]
[PATCH] fix WANT_PAGE_VIRTUAL in memmap_init
I spotted this issue while in memmap_init last week. I can't say the
change has any test coverage by me. start_pfn was formerly used in main
"for" loop. The fix is replace start_pfn with pfn.
Signed-off-by: Bob Picco <bob.picco@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Kumar Gala [Mon, 27 Jun 2005 21:36:16 +0000 (14:36 -0700)]
[PATCH] ppc32: Fix compiling of sandpoint platform
Lost a curly brace in translation. Everything is better now.
Signed-off-by: Matt McClintock <msm@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Mon, 27 Jun 2005 22:04:08 +0000 (15:04 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Mon, 27 Jun 2005 22:00:10 +0000 (15:00 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 27 Jun 2005 21:55:50 +0000 (14:55 -0700)]
Merge 'upstream' branch of /linux/kernel/git/jgarzik/netdev-2.6
Linus Torvalds [Mon, 27 Jun 2005 21:54:50 +0000 (14:54 -0700)]
Merge 'upstream' branch of /linux/kernel/git/jgarzik/libata-dev
Linus Torvalds [Mon, 27 Jun 2005 21:53:48 +0000 (14:53 -0700)]
Merge 'upstream' branch of /linux/kernel/git/jgarzik/misc-2.6
Linus Torvalds [Mon, 27 Jun 2005 21:47:31 +0000 (14:47 -0700)]
Merge /linux/kernel/git/dtor/input.git manually
Some manual fixups required due to clashes with the PF_FREEZE cleanups.
Dave Jones [Mon, 27 Jun 2005 05:39:28 +0000 (01:39 -0400)]
[PATCH] fix silly config option.
CONFIG_CONFIG_TUNER_MULTI_I2C probably isn't what the
author meant to create.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jens Axboe [Mon, 27 Jun 2005 12:49:39 +0000 (14:49 +0200)]
[PATCH] CFQ io scheduler: scheduler switch oops
If cfq is managing a queue and a new scheduler is later selected, it is
possible for the cfqd unplug_work work to be queued after the kblockd
work struct has been flushed. The problem is the ordering of
cfq_shutdown_timer_wq() and blk_put_queue() in cfq_put_cfqd(). The
latter may rearm the work, leaving cfq_kick_queue() with dead data.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jens Axboe [Mon, 27 Jun 2005 08:56:58 +0000 (10:56 +0200)]
[PATCH] CFQ io scheduler, add ioprio documentation
Add ioprio documentation
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jens Axboe [Mon, 27 Jun 2005 08:56:24 +0000 (10:56 +0200)]
[PATCH] CFQ io scheduler updates
- Adjust slice values
- Instead of one async queue, one is defined per priority level. This
prevents kernel threads (such as reiserfs/x and others) that run at
higher io priority from conflicting with others. Previously, it was a
coin toss what io prio the async queue got, it was defined by who
first set up the queue.
- Let a time slice only begin, when the previous slice is completely
done. Previously we could be somewhat unfair to a new sync slice, if
the previous slice was async and had several ios queued. This might
need a little tweaking if throughput suffers a little due to this,
allowing perhaps an overlap of a single request or so.
- Optimize the calling of kblockd_schedule_work() by doing it only when
it is strictly necessary (no requests in driver and work left to do).
- Correct sync vs async logic. A 'normal' process can be purely async as
well, and a flusher can be purely sync as well. Sync or async is now a
property of the class defined and requests pending. Previously writers
could be considered sync, when they were really async.
- Get rid of the bit fields in cfqq and crq, use flags instead.
- Various other cleanups and fixes
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jens Axboe [Mon, 27 Jun 2005 08:55:49 +0000 (10:55 +0200)]
[PATCH] Fix cfq_find_next_crq()
In cfq_find_next_crq(), cfq tries to find the next request by choosing
one of two requests before and after the current one. Currently, when
choosing the next request, if there's no next request, the next
candidate is NULL, resulting in selection of the previous request. This
results in weird scheduling. Once we reach the end, we always seek
backward.
The correct behavior is using the first request as the next candidate.
cfq_choose_req() already has logics for handling wrapped requests.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jens Axboe [Mon, 27 Jun 2005 08:55:12 +0000 (10:55 +0200)]
[PATCH] Update cfq io scheduler to time sliced design
This updates the CFQ io scheduler to the new time sliced design (cfq
v3). It provides full process fairness, while giving excellent
aggregate system throughput even for many competing processes. It
supports io priorities, either inherited from the cpu nice value or set
directly with the ioprio_get/set syscalls. The latter closely mimic
set/getpriority.
This import is based on my latest from -mm.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Deepak Saxena [Mon, 27 Jun 2005 20:48:48 +0000 (21:48 +0100)]
[PATCH] ARM: 2759/1: Fix IXP4xx debug code (again)
Patch from Deepak Saxena
Accidently swapped the order of movne and orrne. Bad.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Michael Burian [Mon, 27 Jun 2005 14:58:39 +0000 (15:58 +0100)]
[PATCH] ARM: 2758/1: Fix comment in file header to read "ARM" instead i386
Patch from Michael Burian
This does not look like an include file for "i386", so use "ARM" instead.
Signed-off-by: Michael Burian <dynmail1@gassner-waagen.at>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 13:49:10 +0000 (14:49 +0100)]
[PATCH] ARM: Update mach-types
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 13:23:38 +0000 (14:23 +0100)]
[PATCH] ARM: Fix speeling eroor in io.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 13:16:47 +0000 (14:16 +0100)]
[PATCH] ARM: Move memmap freeing into init.c
It doesn't make sense for this to be in mm-armv.c now that 26-bit
ARM support is no longer integrated into arch/arm.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 13:08:56 +0000 (14:08 +0100)]
[PATCH] ARM: Move PGD kernel page table initialisation
It doesn't make sense to have the PGD kernel pointers initialisation
separate from the PGD user pointers, especially when we clean the
data cache over the whole range.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 13:04:05 +0000 (14:04 +0100)]
[PATCH] ARM: Add VST idle loop call
This call allows the dynamic tick support to reprogram the timer
immediately before the CPU idles.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 12:59:43 +0000 (13:59 +0100)]
[PATCH] ARM: Add missed
AAEC2000 file
My scripts missed committing this file.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 10:12:54 +0000 (11:12 +0100)]
[PATCH] Serial: Split 8250 port table
Add separate files for the different 8250 ISA-based serial boards.
Looking across all the various architectures, it seems reasonable that
we can key the availability of the configuration options for these
beasts to the bus-related symbols (iow, CONFIG_ISA). We also standardise
the base baud/uart clock rate for these boards - I'm sure that isn't
architecture specific, but is solely dependent on the crystal fitted
on the board (which should be the same no matter what type of machine
its fitted into.)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King [Mon, 27 Jun 2005 09:29:26 +0000 (10:29 +0100)]
[PATCH] Serial: Remove {un,}register_serial from 68328serial.c
68328serial.c does not make use of register_serial/unregister_serial,
which is traditionally used to register 8250-compatible UARTs with
the 8250-compatible serial driver.
Acked-by: David McCullough
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tobias Klauser [Sat, 28 May 2005 23:17:29 +0000 (01:17 +0200)]
[PATCH] sound/oss/via82cxxx_audio: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
See http://marc.theaimsgroup.com/?t=
108001993000001&r=1&w=2 for details
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Philip Pokorny [Sat, 28 May 2005 08:24:47 +0000 (01:24 -0700)]
[PATCH] libata fix read capacity handling for more than 2TB
This is a multi-part message in MIME format.
John W. Linville [Wed, 8 Jun 2005 19:11:57 +0000 (15:11 -0400)]
[PATCH] b44: check link state during open
Check the link state during b44_open. This closes a 1 HZ window
that existed after b44_open ran but before the b44_timer handler ran,
during which ethtool would report "Link detected: yes" no matter what
the link state actually was.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Adam Belay [Mon, 20 Jun 2005 21:28:41 +0000 (14:28 -0700)]
[PATCH] fix tulip suspend/resume #2
This patch allows the tulip driver to suspend and resume properly. It was
originally written by Karsten Keil and then modified by Adam Belay.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Adam Belay <abelay@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Olaf Hering [Wed, 25 May 2005 23:16:51 +0000 (01:16 +0200)]
[PATCH] uninitialized variable in prism54 isl38xx_trigger_device
drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_sec' is used uninitialized in this function
drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_usec' is used uninitialized in this function
Signed-off-by: Olaf Hering <olh@suse.de>
YOSHIFUJI Hideaki [Wed, 25 May 2005 07:07:04 +0000 (16:07 +0900)]
[PATCH] NETDEV: fix receiving multicast frames.
Some USB ethernet drivers did not accept multicast frames appropriately.
IPv6 did not work with those drivers without this patch.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
YOSHIFUJI Hideaki [Wed, 25 May 2005 07:06:59 +0000 (16:06 +0900)]
[PATCH] NETDEV: Elecom (Laneed) LD-USBL/TX support.
Elecom (Laneed) LD-USBL/TX support.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Randy Dunlap [Mon, 13 Jun 2005 19:31:53 +0000 (12:31 -0700)]
[PATCH] 3c523: needs a license
Module needs a license to prevent kernel tainting.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
diffstat:=
drivers/net/3c523.c | 1 +
1 files changed, 1 insertion(+)
Kumar Gala [Mon, 20 Jun 2005 15:54:21 +0000 (10:54 -0500)]
[PATCH] gianfar: Add support enhanced TSEC features on the MPC 8548
Jeff,
Just incase this got lost in the recent netdev mailing list transition
here is a nicer version of Andy's patch for gianfar.
- kumar
* TCP/IP/UDP checksumming and verification
* VLAN tag insertion/extraction
* Larger multicast hash-table
* Padding to align IP headers
Also added:
* msg lvl support
* Some whitespace cleanup
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Nicolas Pitre [Mon, 20 Jun 2005 03:56:21 +0000 (23:56 -0400)]
[PATCH] smc91x: plug race between TX tasklet and driver reset
The race causes a kernel oops when smc_hardware_send_pkt() tries to
dereference pending_tx_skb which would have been freed from one of the
driver reset paths just after the tx_task tasklet has been scheduled.
This race is possible on SMP but was uncovered by the kernel RT work.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Denis Vlasenko [Fri, 17 Jun 2005 05:23:17 +0000 (08:23 +0300)]
[PATCH] via-rhine trivial whitespace patch
--Boundary-00=_F5lsC5eH1wGW5o9
Content-Type: text/plain;
charset="koi8-r"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hi Jeff,
In some messages in via-rhine.c there is a leading space
for no apparent reason. This patch removes it.
--
vda
--Boundary-00=_F5lsC5eH1wGW5o9
Content-Type: text/x-diff;
charset="koi8-r";
name="via-rhine.c.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="via-rhine.c.diff"
Malli Chilakala [Sat, 18 Jun 2005 00:46:06 +0000 (17:46 -0700)]
[PATCH] e1000: Driver version, white space, comments & other
Driver version, white space, comments & other
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:44:49 +0000 (17:44 -0700)]
[PATCH] e1000: Included proposals to false late collisions due to H/W latencies
Included proposals to false late collisions due to H/W latencies
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:44:20 +0000 (17:44 -0700)]
[PATCH] e1000: Ethtool set speed/duplex validates parameters for consistency
Ethtool set speed/duplex validates parameters for consistency
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:43:56 +0000 (17:43 -0700)]
[PATCH] e1000: Enable ethtool phys_id feature for 82573 controllers
Enable ethtool phys_id feature for 82573 controllers
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:43:25 +0000 (17:43 -0700)]
[PATCH] e1000: Fixed VLAN tag processing error for big-endian architectures
Fixed VLAN tag processing error for big-endian architectures
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:43:06 +0000 (17:43 -0700)]
[PATCH] e1000: Ethtool cleanup patch from Stephen Hemminger
Ethtool cleanup patch from Stephen Hemminger
* use ADVERTISED_xxx fields when setting advertised fields
* don't hardcode constant for advertised field
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:42:42 +0000 (17:42 -0700)]
[PATCH] e1000: Fixed the loopback test failure for 82573 based adapters
Fixed the loopback test failure for 82573 based adapters
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:42:29 +0000 (17:42 -0700)]
[PATCH] e1000: Fixed register and loopback test failures with 82573 controllers
Fixed register and loopback test failures with 82573 controllers
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:42:07 +0000 (17:42 -0700)]
[PATCH] e1000: Cleanup debug message printed when Tx Unit hang is detected
Cleanup debug message printed when Tx Unit hang is detected
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:41:45 +0000 (17:41 -0700)]
[PATCH] e1000: Use netdev_priv() to get to netdev->priv
Use netdev_priv() to get to netdev->priv - from shemminger@osdl.org
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:40:41 +0000 (17:40 -0700)]
[PATCH] e1000: Use correct WOL settings for 82544 adapters
Use correct WOL settings for 82544 adapters
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:40:19 +0000 (17:40 -0700)]
[PATCH] e1000: Synchronize phy access between stats update and MII_IOCTL
Synchronize phy access between stats update and MII_IOCTL
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:31:44 +0000 (17:31 -0700)]
[PATCH] e100: NAPI performance enhancements
NAPI performance enhancements - Fixed issues with shared interrupts and NAPI resulting in bad performance.
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:30:22 +0000 (17:30 -0700)]
[PATCH] e100: e100_eeprom_load was called after e100_phy_init
e100_eeprom_load was called after e100_phy_init causing phy_init
not to use values set in EEPROM - from emann@mrv.com
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Malli Chilakala [Sat, 18 Jun 2005 00:27:41 +0000 (17:27 -0700)]
[PATCH] e100: fixed e100 MDI/MDI-X issues
Added patch from Eran Mann to fix following e100 MDI/MDI-X issues
* MDI/MDI-X autodetection should never be enabled for 82551ER/QM chips
* enabling this feature based on eeprom settings
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Jeff Garzik [Mon, 27 Jun 2005 04:27:47 +0000 (00:27 -0400)]
Merge /spare/repo/netdev-2.6/ branch 'orinoco'
Jeff Garzik [Mon, 27 Jun 2005 04:27:07 +0000 (00:27 -0400)]
wireless/orinoco: remove changelog, bump version
Christoph Hellwig [Sat, 18 Jun 2005 23:28:06 +0000 (01:28 +0200)]
[PATCH] orinoco: monitor mode support
Patch from Pavel Roskin
Christoph Hellwig [Sat, 18 Jun 2005 23:28:02 +0000 (01:28 +0200)]
[PATCH] orinoco: always use 802.11 header for rx processing
If the frame has ToDS flag set, mark it by setting skb->pkt_type to
PACKET_OTHERHOST, so that applications unaware of promiscous mode won't get
uplink (STA->AP) packets for STA->STA transmissions relayed by the AP.
Thanks to John Denker and David Gibson for finding the problem and the
solution.
Patch from Pavel Roskin
Christoph Hellwig [Sat, 18 Jun 2005 23:27:56 +0000 (01:27 +0200)]
[PATCH] orinoco: scanning support
Patch from Pavel Roskin
Christoph Hellwig [Sat, 18 Jun 2005 23:27:51 +0000 (01:27 +0200)]
[PATCH] orinoco: manual roaming for Symbol and Intersilfirmware
Patch from Pavel Roskin
Christoph Hellwig [Sat, 18 Jun 2005 23:27:40 +0000 (01:27 +0200)]
[PATCH] orinoco: basic ethtool support
I completely reimplemented this based on ethtool_ops, CVS has an
ioctl-based version.
Christoph Hellwig [Sat, 18 Jun 2005 23:27:33 +0000 (01:27 +0200)]
[PATCH] orinoco: wireless API 15 support
(patch from Moustafa Youssef, updated by Jim Carter and Pavel Roskin).
Christoph Hellwig [Sat, 18 Jun 2005 23:27:28 +0000 (01:27 +0200)]
[PATCH] orinoco: include <net/ieee80211.h>
We need constants from this header in the next patches.
Christoph Hellwig [Sat, 18 Jun 2005 23:27:20 +0000 (01:27 +0200)]
[PATCH] bring over ieee80211.h from mainline
the prototypes and inlines aren't actually needed, but let's not diverge
from -mm too far.
dmitry pervushin [Mon, 20 Jun 2005 22:32:54 +0000 (15:32 -0700)]
[PATCH] cs89x0.c: support for Philips' pnx0105 network adapter
This patch is to provide support for cs89x0-based network device on
Philips' pnx0105 board.
Signed-off-by: dmitry pervushin <dpervushin@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Adrian Bunk [Tue, 21 Jun 2005 08:47:06 +0000 (01:47 -0700)]
[PATCH] drivers/net/skfp/: cleanups
This patch contains the following cleanups:
- make needlessly global code static
- remove the completely unused smtparse.c
- remove the following unused global functions:
- drvfbi.c: init_dma
- drvfbi.c: dis_dma
- drvfbi.c: get_rom_byte
- drvfbi.c: mac_drv_vpd_read
- drvfbi.c: mac_drv_pci_fix
- fplustm.c: mac_set_func_addr
- fplustm.c: mac_del_multicast
- hwmtm.c: mac_drv_rx_frag
- pcmplc.c: pcm_set_lct_short
- smt.c: smt_please_reconnect
- smt.c: smt_change_t_neg
- smtdef.c: smt_set_defaults
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Hideki Yamane [Mon, 27 Jun 2005 04:18:32 +0000 (00:18 -0400)]
[netdrvr] tulip: add pci id
Manfred Spraul [Sun, 26 Jun 2005 09:36:52 +0000 (11:36 +0200)]
[PATCH] forcedeth: Add support for new device id
This is a multi-part message in MIME format.
Manfred Spraul [Sat, 18 Jun 2005 14:27:19 +0000 (16:27 +0200)]
[PATCH] forcedeth: Poll for link changes
This is a multi-part message in MIME format.
Manfred Spraul [Sun, 5 Jun 2005 15:36:11 +0000 (17:36 +0200)]
[PATCH] forcedeth: add two new pci ids
This is a multi-part message in MIME format.
Tobias Klauser [Mon, 20 Jun 2005 21:49:08 +0000 (23:49 +0200)]
[PATCH] drivers/block/sx8.c: Use the DMA_{64, 32}BIT_MASK constants
Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()
These patches include dma-mapping.h explicitly because it caused errors
on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=
108001993000001&r=1&w=2 for details
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Nishanth Aravamudan [Mon, 20 Jun 2005 21:53:40 +0000 (23:53 +0200)]
[PATCH] net/lanstreamer: replace schedule_timeout() with ssleep()/msleep_interruptible()
Use ssleep() / msleep_interruptible() [as appropriate]
instead of schedule_timeout() to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Nishanth Aravamudan [Mon, 20 Jun 2005 21:54:12 +0000 (23:54 +0200)]
[PATCH] net/pcnet32: replace schedule_timeout() with msleep_interruptible()
Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Nishanth Aravamudan [Mon, 20 Jun 2005 21:54:25 +0000 (23:54 +0200)]
[PATCH] net/farsync: add set_current_state() before schedule_timeout()
Insert set_current_state() before schedule_timeout() so the
function delays as expected. Without the addition, schedule_timeout()
will return immediately.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Nishanth Aravamudan [Mon, 20 Jun 2005 21:54:27 +0000 (23:54 +0200)]
[PATCH] net/sb1000: replace nicedelay() with ssleep()
Use ssleep() instead of nicedelay()
to guarantee the task delays as expected. Remove the prototype and
definition of nicedelay(). This is a very weird function, because it is
called to sleep in terms of usecs, but always sleeps for 1 second,
completely ignoring the parameter. I have gone ahead and followed suit,
just sleeping for a second in all cases, but maybe someone with the
hardware could tell me if perhaps the paramter *should* matter. Additionally,
nicedelay() is called in TASK_INTERRUPTIBLE state, but doesn't deal with signals
in case these longer delays do not complete, so I believe ssleep() is more
appropriate.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Domen Puncer [Mon, 20 Jun 2005 21:54:37 +0000 (23:54 +0200)]
[PATCH] wireless: char* -> char[] conversion in airo.c
This conversion makes code from line 7101 right:
if (copy_to_user(com.data, swversion, sizeof(swversion)))
size output (before, after):
55416 2228 160 57804 e1cc drivers/net/wireless/airo.o
55412 2228 160 57800 e1c8 drivers/net/wireless/airo.o
more outputs from Alexey Dobriyan:
2.95.3:
text data bss dec hex filename
before 51118 2156 160 53434 d0ba drivers/net/wireless/airo.o
after 51118 2156 160 53434 d0ba drivers/net/wireless/airo.o
3.3.5-
20050130:
before 46999 2156 160 49315 c0a3 drivers/net/wireless/airo.o
after 46994 2156 160 49310 c09e drivers/net/wireless/airo.o
4.1.0-
20050522:
before 45555 2220 160 47935 bb3f drivers/net/wireless/airo.o
after 45550 2220 160 47930 bb3a drivers/net/wireless/airo.o
Signed-off-by: Domen Puncer <domen@coderock.org>
Linus Torvalds [Mon, 27 Jun 2005 02:16:33 +0000 (19:16 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 27 Jun 2005 00:28:24 +0000 (17:28 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
pageexec [Sun, 26 Jun 2005 23:00:19 +0000 (16:00 -0700)]
[IPVS]: Fix for overflows
From: <pageexec@freemail.hu>
$subject was fixed in 2.4 already, 2.6 needs it as well.
The impact of the bugs is a kernel stack overflow and privilege escalation
from CAP_NET_ADMIN via the IP_VS_SO_SET_STARTDAEMON/IP_VS_SO_GET_DAEMON
ioctls. People running with 'root=all caps' (i.e., most users) are not
really affected (there's nothing to escalate), but SELinux and similar
users should take it seriously if they grant CAP_NET_ADMIN to other users.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sascha Hauer [Mon, 20 Jun 2005 22:32:51 +0000 (15:32 -0700)]
[PATCH] DM9000 network driver bugfix
This patch fixes two bugs in the dm9000 network driver:
- Don't read one byte too much in 8bit mode.
- release correct resource
Signed-off-by: Jochen Karrer <j.karrer@lightmaze.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Ismail Donmez [Mon, 20 Jun 2005 22:32:52 +0000 (15:32 -0700)]
[PATCH] Documentation/networking/dmfe.txt: Make documentation nicer
Patch indents dmfe.txt to look like other docs. It adds a tip about CNET
cards using Davicom chipsets. Also it removes parts where it refers to how
to build driver out-of-kernel which seems to be cruft from times where the
driver was out of the kernel.
Signed-off-by: Ismail Donmez <ismail@kde.org.tr>
Signed-off-by: Domen Puncer <domen@coderock.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Denis Vlasenko [Mon, 20 Jun 2005 22:33:04 +0000 (15:33 -0700)]
[PATCH] fealnx.c calls dev_kfree_skb from atomic context
Signed-off-by: Andrew Morton <akpm@osdl.org>
Pavel Machek [Mon, 20 Jun 2005 22:33:04 +0000 (15:33 -0700)]
[PATCH] fix int vs. pm_message_t confusion in airo
Fix int vs. pm_message_t confusion in airo. Should change no code.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Maciej W. Rozycki [Mon, 20 Jun 2005 22:33:03 +0000 (15:33 -0700)]
[PATCH] defxx: Use irqreturn_t for the interrupt handler
This is a fix for the interrupt handler in the defxx driver to use
irqreturn_t. Beside the obvious fix of returning a proper status at all,
it actually checks board registers as appropriate for determining if an
interrupt has been recorded in the bus-specific interface logic.
The patch also includes an obvious one-line fix for SET_NETDEV_DEV needed
for the EISA variation, for which I've decided there is no point in sending
separately.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Andrew Morton [Mon, 20 Jun 2005 22:32:59 +0000 (15:32 -0700)]
[PATCH] dmfe warning fix
drivers/net/tulip/dmfe.c: In function `dmfe_parse_srom':
drivers/net/tulip/dmfe.c:1805: warning: passing arg 1 of `__le16_to_cpup' from incompatible pointer type
drivers/net/tulip/dmfe.c:1817: warning: passing arg 1 of `__le32_to_cpup' from incompatible pointer type
drivers/net/tulip/dmfe.c:1817: warning: passing arg 1 of `__le32_to_cpup' from incompatible pointer type
This is basically a guess:
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Adrian Bunk [Mon, 16 May 2005 19:13:03 +0000 (21:13 +0200)]
[PATCH] document that 8139TOO supports 8129/8130
The 8129/8130 support is a sub-option that is not visible if the user
hasn't enabled the 8139 support.
Let's make it a bit easier for users to find the driver for their nic.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
David S. Miller [Sun, 26 Jun 2005 22:31:51 +0000 (15:31 -0700)]
[NETLINK]: Fix two socket hashing bugs.
1) netlink_release() should only decrement the hash entry
count if the socket was actually hashed.
This was causing hash->entries to underflow, which
resulting in all kinds of troubles.
On 64-bit systems, this would cause the following
conditional to erroneously trigger:
err = -ENOMEM;
if (BITS_PER_LONG > 32 && unlikely(hash->entries >= UINT_MAX))
goto err;
2) netlink_autobind() needs to propagate the error return from
netlink_insert(). Otherwise, callers will not see the error
as they should and thus try to operate on a socket with a zero pid,
which is very bad.
However, it should not propagate -EBUSY. If two threads race
to autobind the socket, that is fine. This is consistent with the
autobind behavior in other protocols.
So bug #1 above, combined with this one, resulted in hangs
on netlink_sendmsg() calls to the rtnetlink socket. We'd try
to do the user sendmsg() with the socket's pid set to zero,
later we do a socket lookup using that pid (via the value we
stashed away in NETLINK_CB(skb).pid), but that won't give us the
user socket, it will give us the rtnetlink socket. So when we
try to wake up the receive queue, we dive back into rtnetlink_rcv()
which tries to recursively take the rtnetlink semaphore.
Thanks to Jakub Jelink for providing backtraces. Also, thanks to
Herbert Xu for supplying debugging patches to help track this down,
and also finding a mistake in an earlier version of this fix.
Signed-off-by: David S. Miller <davem@davemloft.net>