commit 3603bc8dc5ab33941e6378fe52ea03b7f5561109
tree f24249bb172b593b0087efa31112967ee3c44325
parent 68ca243dd1dc90bd42bae3945e804c1042584920
parent a8b554e75b0c14d5e12a11eaea604e536f49da29
author Linus Torvalds <torvalds@g5.osdl.org> Wed, 28 Dec 2005 13:45:19 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 28 Dec 2005 13:45:19 -0800
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6
commit 68ca243dd1dc90bd42bae3945e804c1042584920
tree df6cb278ddce22daf8b524c82f2b43f012e025a0
parent d5784b57d2e08a632b971baae23266121004ef3b
author David S. Miller <davem@sunset.davemloft.net> Wed, 28 Dec 2005 13:27:04 -0800
committer David S. Miller <davem@sunset.davemloft.net> Wed, 28 Dec 2005 13:27:04 -0800
[SERMOUSE]: Sun mice speak 5-byte protocol too.
Noticed by Christophe Zimmerman, this explains the slow mouse movement
with 2.6.x kernels.
And checking the 2.4.x drivers/sbus/char/sunmouse.c driver shows we
always used a 5-byte protocol with Sun mice in the past. I have no
idea how the 3-byte thing got into the 2.6.x driver, but it's surely
wrong.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d5784b57d2e08a632b971baae23266121004ef3b
tree a00fb221e07d68eefa4c093efa98ef84a03342af
parent 67dbb4ea33731415fe09c62149a34f472719ac1d
author David S. Miller <davem@sunset.davemloft.net> Wed, 28 Dec 2005 13:22:54 -0800
committer David S. Miller <davem@sunset.davemloft.net> Wed, 28 Dec 2005 13:22:54 -0800
[SPARC]: Use STABS_DEBUG and DWARF_DEBUG macros in vmlinux.lds.S
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a8b554e75b0c14d5e12a11eaea604e536f49da29
tree 53392403940c6d28c1be4b75e7b79e8c50938faa
parent 091465d7514893a55dcf63e420698b21159c39a7
author David S. Miller <davem@sunset.davemloft.net> Wed, 28 Dec 2005 13:05:41 -0800
committer David S. Miller <davem@sunset.davemloft.net> Wed, 28 Dec 2005 13:05:41 -0800
[TG3]: Update driver version and reldate.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 091465d7514893a55dcf63e420698b21159c39a7
tree cbfaedb45164d21d0d2f4af5efad2fc78dd37f92
parent 67dbb4ea33731415fe09c62149a34f472719ac1d
author Chris Elmquist <chrise@sgi.com> Tue, 20 Dec 2005 13:25:19 -0800
committer David S. Miller <davem@sunset.davemloft.net> Wed, 28 Dec 2005 13:04:52 -0800
[TG3]: ethtool -d hangs PCIe systems
Resubmitting after recommendation to use GET_REG32_1() instead of
GET_REG32_LOOP(..., 1). Retested. Problem remains fixed.
Prevent tg3_get_regs() from reading reserved and undocumented registers
at RX_CPU_BASE and TX_CPU_BASE offsets which caused hostile behavior
on PCIe platforms.
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 67dbb4ea33731415fe09c62149a34f472719ac1d
tree 5d417d821fb181ce683c60dabcfa33d8c6f65fb8
parent 5ab4a6c81eb3dbe32361791d1535f9153f79b0ed
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Tue, 27 Dec 2005 12:49:33 +1100
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 27 Dec 2005 19:57:52 -0800
[PATCH] Fix more radeon GART start calculation cases
As reported by Jules Villard <jvillard@ens-lyon.fr> and some others, the
recent GART aperture start reconfiguration causes problems on some
setups.
What I _think_ might be happening is that the X server is also trying to
muck around with the card memory map and is forcing it back into a wrong
setting that also happens to no longer match what the DRM wants to do
and blows up. There are bugs all over the place in that code (and still
some bugs in the DRM as well anyway).
This patch attempts to avoid that by using the largest of the 2 values,
which I think will cause it to behave as it used to for you and will
still fix the problem with machines that have an aperture size smaller
than the video memory.
Acked-by: Jules Villard <jvillard@ens-lyon.fr>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5ab4a6c81eb3dbe32361791d1535f9153f79b0ed
tree c89504389bf1a3452a499db9ea19acea76941616
parent 1b93ae64cabe5e28dd5a1f35f96f938ca4f6ae20
author David L Stevens <dlstevens@us.ibm.com> Tue, 27 Dec 2005 14:03:00 -0800
committer David S. Miller <davem@davemloft.net> Tue, 27 Dec 2005 14:03:00 -0800
[IPV6] mcast: Fix multiple issues in MLDv2 reports.
The below "jumbo" patch fixes the following problems in MLDv2.
1) Add necessary "ntohs" to recent "pskb_may_pull" check [breaks
all nonzero source queries on little-endian (!)]
2) Add locking to source filter list [resend of prior patch]
3) fix "mld_marksources()" to
a) send nothing when all queried sources are excluded
b) send full exclude report when source queried sources are
not excluded
c) don't schedule a timer when there's nothing to report
NOTE: RFC 3810 specifies the source list should be saved and each
source reported individually as an IS_IN. This is an obvious DOS
path, requiring the host to store and then multicast as many sources
as are queried (e.g., millions...). This alternative sends a full,
relevant report that's limited to number of sources present on the
machine.
4) fix "add_grec()" to send empty-source records when it should
The original check doesn't account for a non-empty source
list with all sources inactive; the new code keeps that
short-circuit case, and also generates the group header
with an empty list if needed.
5) fix mca_crcount decrement to be after add_grec(), which needs
its original value
These issues (other than item #1 ;-) ) were all found by Yan Zheng,
much thanks!
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1b93ae64cabe5e28dd5a1f35f96f938ca4f6ae20
tree a8c5c7d08e6c658853245ad0b0cf47f0af1ff83d
parent 6732badee0dad467fcc9dd0168af8677b2b1bc2f
author David S. Miller <davem@sunset.davemloft.net> Tue, 27 Dec 2005 13:57:59 -0800
committer David S. Miller <davem@sunset.davemloft.net> Tue, 27 Dec 2005 13:57:59 -0800
[NET]: Validate socket filters against BPF_MAXINSNS in one spot.
Currently the checks are scattered all over and this leads
to inconsistencies and even cases where the check is not made.
Based upon a patch from Kris Katterjohn.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6732badee0dad467fcc9dd0168af8677b2b1bc2f
tree 43fd9fbb5759de0e4a182d473621699b1ff453bc
parent 79cac2a221ce18642550a13bed0f0203514923ea
author YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Tue, 27 Dec 2005 13:35:15 -0800
committer David S. Miller <davem@davemloft.net> Tue, 27 Dec 2005 13:35:15 -0800
[IPV6]: Fix addrconf dead lock.
We need to release idev->lcok before we call addrconf_dad_stop().
It calls ipv6_addr_del(), which will hold idev->lock.
Bug spotted by Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 79cac2a221ce18642550a13bed0f0203514923ea
tree ecc66198fee701916e247c44e6bad0db387535ce
parent 6f4353d891b5e477528cd0b996e0263fecdf5d5f
author David Kimdon <david.kimdon@devicescape.com> Mon, 26 Dec 2005 17:27:10 -0800
committer David S. Miller <davem@davemloft.net> Mon, 26 Dec 2005 17:27:10 -0800
[BR_NETFILTER]: Fix leak if skb traverses > 1 bridge
Call nf_bridge_put() before allocating a new nf_bridge structure and
potentially overwriting the pointer to a previously allocated one.
This fixes a memory leak which can occur when the bridge topology
allows for an skb to traverse more than one bridge.
Signed-off-by: David Kimdon <david.kimdon@devicescape.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6f4353d891b5e477528cd0b996e0263fecdf5d5f
tree 9f8f9f066fa82cf6b45a0b5002549f4b08c5fbbb
parent 04333393b930370db0cc29fdf0dbbd08ecd43337
author David L Stevens <dlstevens@us.ibm.com> Mon, 26 Dec 2005 17:03:46 -0800
committer David S. Miller <davem@davemloft.net> Mon, 26 Dec 2005 17:03:46 -0800
[IPV6]: Increase default MLD_MAX_MSF to 64.
The existing default of 10 is just way too low.
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 04333393b930370db0cc29fdf0dbbd08ecd43337
tree f50d8ab5315919c34ef2c97d99f92e3920b4c4d4
parent f89f5948fc10bb973cd452d2e334da207828e228
author James Bottomley <James.Bottomley@SteelEye.com> Mon, 26 Dec 2005 09:58:49 -0600
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 26 Dec 2005 10:17:43 -0800
[PATCH] Fix Fibre Channel boot oops
The oops is characteristic of the underlying device being removed from
visibility before the class device, and sure enough we do device_del()
before transport_unregister() in the scsi_target_reap() routines. I've
no idea why this is suddenly showing up, since the code has been in
there since that function was first invented. However, I've confirmed
this fixes Andrew Vasquez's boot oops.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>