]> err.no Git - linux-2.6/log
linux-2.6
18 years agoMerge branch 'upstream-fixes' into upstream
Jeff Garzik [Sat, 27 May 2006 02:01:26 +0000 (22:01 -0400)]
Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/s390/net/ctctty.c

18 years ago[netdrvr s/390] trim trailing whitespace
Jeff Garzik [Sat, 27 May 2006 01:58:38 +0000 (21:58 -0400)]
[netdrvr s/390] trim trailing whitespace

Previous fix patches added a bunch of trailing whitespace,
which git-applymbox complained loudly about.

18 years ago[PATCH] s390: lcs driver bug fixes and improvements [2/2]
Klaus Wacker [Wed, 24 May 2006 07:51:21 +0000 (09:51 +0200)]
[PATCH] s390: lcs driver bug fixes and improvements [2/2]

This is the second lcs driver patch containing the rest of lcs fixes.

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] s390: lcs driver bug fixes and improvements [1/2]
Klaus Wacker [Wed, 24 May 2006 07:51:17 +0000 (09:51 +0200)]
[PATCH] s390: lcs driver bug fixes and improvements [1/2]

Several problems occured with lcs device driver:
 - device not operational anymore after cable pull/plug-in.
         - unpredictable results occured, e.g. kernel panic
   using cards of type QD8F.
 - STOPLAN and delete multicast address command
           were not proper recognized by OSA card under heavy network workload.
         - channel/device error checks missing in interrupt handler.
To fix all problems at once recovery of lcs devices has been improved.
missing error checks in lcs interrupt handler has been added.
Once a hardware problem occurs lcs will recover the device now properly.

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] s390: qeth driver fixes
Ursula Braun [Wed, 24 May 2006 07:51:13 +0000 (09:51 +0200)]
[PATCH] s390: qeth driver fixes

From: Frank Blaschka <Frank.Blaschka@de.ibm.com>
From: Frank Pavlic <fpavlic@de.ibm.com>

        - fix fake_ll during initial device bringup. fake_ll was
  not active after first start of the device.
  Problem only occured when qeth was built without IPV6 support.
        - avoid skb usage after invocation of qeth_flush_buffers,
  because skb might already be freed.
        - remove yet another useless netif_wake_queue in
  qeth_softsetup_ipv6 since this function is only called
  when device is going online. In this case card->state will
  never be in state UP. So let the net_device queue down .

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] s390: qeth driver fixes
Ursula Braun [Wed, 24 May 2006 07:51:11 +0000 (09:51 +0200)]
[PATCH] s390: qeth driver fixes

From: Frank Pavlic <fpavlic@de.ibm.com>

- correct checking of sscanf-%n value in qeth_string_to_ipaddr().
- don't use netif_stop_queue outside the hard_start_xmit routine.
  Rather use netif_tx_disable.
- don't call qeth_netdev_init on a recovery.

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] s390: minor fix in cu3088
Cornelia Huck [Wed, 24 May 2006 07:51:05 +0000 (09:51 +0200)]
[PATCH] s390: minor fix in cu3088

In case of a parse error for the cu3088 group attribute,
return -EINVAL instead of count.

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] r8169: add new PCI ID
Yoichi Yuasa [Thu, 25 May 2006 01:24:46 +0000 (10:24 +0900)]
[PATCH] r8169: add new PCI ID

Hi,

This patch add new PCI ID for r8169 driver.
RTL8110SBL has this PCI ID.

Please aply.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[netdrvr] trim trailing whitespace: 8139*.c, epic100, forcedeth, tulip/*
Jeff Garzik [Sat, 27 May 2006 01:39:03 +0000 (21:39 -0400)]
[netdrvr] trim trailing whitespace: 8139*.c, epic100, forcedeth, tulip/*

18 years ago[PATCH] pci_ids: add new device ids
Ayaz Abdulla [Thu, 25 May 2006 17:10:38 +0000 (13:10 -0400)]
[PATCH] pci_ids: add new device ids

This patch adds new device ids for MCP61 and MCP65 chips.

Signed-Off-By: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] forcedeth: add support for flow control
Ayaz Abdulla [Wed, 24 May 2006 22:13:19 +0000 (18:13 -0400)]
[PATCH] forcedeth: add support for flow control

This patch adds flow control support for tx and rx pause frames in
forcedeth.

Signed-Off-By: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] spidernet: replace whitespaces by tabs
Jens Osterkamp [Wed, 24 May 2006 21:33:11 +0000 (23:33 +0200)]
[PATCH] spidernet: replace whitespaces by tabs

The original patch was using whitespaces instead of tabs.

Signed-off-by: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'upstream-fixes' into upstream
Jeff Garzik [Sat, 27 May 2006 01:33:55 +0000 (21:33 -0400)]
Merge branch 'upstream-fixes' into upstream

18 years ago[PATCH] pcnet32: remove incorrect pcnet32_free_ring
Don Fry [Thu, 25 May 2006 23:22:40 +0000 (16:22 -0700)]
[PATCH] pcnet32: remove incorrect pcnet32_free_ring

During a code scan for another change I discovered that this call to
pcnet32_free_ring must be removed.  If the open fails due to a lack of
memory all the ring structures are removed via the call to free_ring
and a subsequent call to open will dereference a null pointer in
pcnet32_init_ring.

Please apply to 2.6.17.

Signed-off-by: Don Fry <brazilnut@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'upstream-fixes' into upstream
Jeff Garzik [Sat, 27 May 2006 01:32:31 +0000 (21:32 -0400)]
Merge branch 'upstream-fixes' into upstream

18 years agoe1000: add shutdown handler back to fix WOL
Auke Kok [Tue, 23 May 2006 20:35:57 +0000 (13:35 -0700)]
e1000: add shutdown handler back to fix WOL

Someone was waaay too aggressive and removed e1000's reboot notifier
instead of porting it to the new way of the shutdown handler.  This change
broke wake on lan.  Add the shutdown handler back in using the same method
as e100 uses.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
(cherry picked from c653e6351e371b33b29871e5eedf610ffb3be037 commit)

18 years ago[PATCH] e1000: endian fixes
Alexey Dobriyan [Tue, 23 May 2006 21:52:21 +0000 (14:52 -0700)]
[PATCH] e1000: endian fixes

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Ronciak, John" <john.ronciak@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'upstream-fixes' into upstream
Jeff Garzik [Sat, 27 May 2006 01:26:34 +0000 (21:26 -0400)]
Merge branch 'upstream-fixes' into upstream

18 years agoMerge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
Jeff Garzik [Sat, 27 May 2006 01:26:22 +0000 (21:26 -0400)]
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 26 May 2006 22:13:33 +0000 (15:13 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: dev.c comment fixes
  [IPV6] ROUTE: Don't try less preferred routes for on-link routes.
  [IRDA]: *_DONGLE should depend on IRTTY_SIR
  [MAINTAINERS]: Add entry for netem

18 years ago[NET]: dev.c comment fixes
Stephen Hemminger [Fri, 26 May 2006 20:25:24 +0000 (13:25 -0700)]
[NET]: dev.c comment fixes

Noticed that dev_alloc_name() comment was incorrect, and more spellung
errors.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IPV6] ROUTE: Don't try less preferred routes for on-link routes.
YOSHIFUJI Hideaki [Fri, 26 May 2006 20:23:41 +0000 (13:23 -0700)]
[IPV6] ROUTE: Don't try less preferred routes for on-link routes.

In addition to the real on-link routes, NONEXTHOP routes
should be considered on-link.

Problem reported by Meelis Roos <mroos@linux.ee>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[PATCH] arlan: fix section mismatch warnings
Randy Dunlap [Thu, 25 May 2006 18:10:08 +0000 (11:10 -0700)]
[PATCH] arlan: fix section mismatch warnings

Fix section mismatch warnings:
WARNING: drivers/net/wireless/arlan.o - Section mismatch: reference to
.init.text:arlan_probe from .text between 'init_module' (at offset
0x3526) and 'cleanup_module'
WARNING: drivers/net/wireless/arlan.o - Section mismatch: reference to
.init.text:init_arlan_proc from .text between 'init_module' (at offset
0x3539) and 'cleanup_module'
WARNING: drivers/net/wireless/arlan.o - Section mismatch: reference to
.exit.text:cleanup_arlan_proc from .text between 'cleanup_module' (at
offset 0x356c) and 'arlan_diagnostic_info_string'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[PATCH] wavelan: fix section mismatch
Randy Dunlap [Thu, 25 May 2006 18:09:21 +0000 (11:09 -0700)]
[PATCH] wavelan: fix section mismatch

Fix section mismatch warning:
WARNING: drivers/net/wireless/wavelan.o - Section mismatch: reference to
.init.text: from .text between 'init_module' (at offset 0x371e) and
'cleanup_module'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
18 years ago[PATCH] tpm: fix bug for TPM on ThinkPad T60 and Z60
Kylene Jo Hall [Fri, 26 May 2006 01:44:27 +0000 (18:44 -0700)]
[PATCH] tpm: fix bug for TPM on ThinkPad T60 and Z60

The TPM chip on the ThinkPad T60 and Z60 machines is returning 0xFFFF for
the vendor ID which is a check the driver made to double check it was
actually talking to the memory mapped space of a TPM.  This patch removes
the check since it isn't absolutely necessary and was causing device
discovery to fail on these machines.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] scx200_acb: fix section mismatch warning
Randy Dunlap [Fri, 26 May 2006 01:44:26 +0000 (18:44 -0700)]
[PATCH] scx200_acb: fix section mismatch warning

WARNING: drivers/i2c/busses/scx200_acb.o - Section mismatch: reference to
.init.text: from .text after 'scx200_add_cs553x' (at offset 0x528)

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] s3c24xx: fix spi driver with CONFIG_PM
Ben Dooks [Fri, 26 May 2006 01:44:25 +0000 (18:44 -0700)]
[PATCH] s3c24xx: fix spi driver with CONFIG_PM

Fix compile bug with the S3C24XX SPI driver when CONFIG_PM is set.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] PowerMac: force only suspend-to-disk to be valid
Johannes Berg [Fri, 26 May 2006 01:44:24 +0000 (18:44 -0700)]
[PATCH] PowerMac: force only suspend-to-disk to be valid

For a very long time, echoing 'standby' or 'mem' into /sys/power/state has
killed the machine on powerpc.  This patch fixes that.

This patch adds the .valid callback to pm_ops on PowerMac so that only the
suspend to disk state can be entered.  Note that just returning 0 would
suffice since the upper layers don't pass PM_SUSPEND_DISK down, but we
handle it there regardless just in case that changes.

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] affs: possible null pointer dereference in affs_rename()
Florin Malita [Fri, 26 May 2006 01:44:23 +0000 (18:44 -0700)]
[PATCH] affs: possible null pointer dereference in affs_rename()

If affs_bread() fails, the exit path calls mark_buffer_dirty_inode() with a
NULL argument.

Coverity CID: 312.

Signed-off-by: Florin Malita <fmalita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] ads7846 conversion accuracy
David Brownell [Fri, 26 May 2006 01:44:20 +0000 (18:44 -0700)]
[PATCH] ads7846 conversion accuracy

This improves accuracy of the touchscreen and hwmon sensor readings,
addressing an issue noted by Imre Deak: there's an extra bit written before
the sample (12 bits) gets written out.

It also catches up to various comments, and makes the /proc/interrupts
entry sensible again.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Imre Deak <imre.deak@nokia.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] x86: wire up vmsplice syscall
Jens Axboe [Fri, 26 May 2006 01:44:19 +0000 (18:44 -0700)]
[PATCH] x86: wire up vmsplice syscall

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Add CMSPAR to termbits.h for powerpc and alpha
Paul Mackerras [Fri, 26 May 2006 01:44:17 +0000 (18:44 -0700)]
[PATCH] Add CMSPAR to termbits.h for powerpc and alpha

Some driver wants to use CMSPAR, but it was missing on alpha and powerpc.
This adds it, with the same value as every other architecture uses.

(akpm: fixes the build of an upcoming gregkh USB patch)

Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] Unlock md devices when stopping them on reboot.
Neil Brown [Fri, 26 May 2006 00:39:25 +0000 (10:39 +1000)]
[PATCH] Unlock md devices when stopping them on reboot.

otherwise we get nasty messages about locks not being released.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Fri, 26 May 2006 18:51:08 +0000 (11:51 -0700)]
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Fix posting lists of 256 receive requests to SRQ for Tavor

18 years agoixgb: update version, dates
Auke Kok [Fri, 26 May 2006 16:38:10 +0000 (09:38 -0700)]
ixgb: update version, dates

increase the year dates to 2006 and bump the version to 1.0.109-k2

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: remove changelog
Auke Kok [Fri, 26 May 2006 16:36:03 +0000 (09:36 -0700)]
ixgb: remove changelog

same as e1000 - remove the changelog from the driver code itself.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: replace netdev->priv with netdev_priv()
Auke Kok [Fri, 26 May 2006 16:35:57 +0000 (09:35 -0700)]
ixgb: replace netdev->priv with netdev_priv()

fix netdev->priv ==> netdev_priv(netdev)

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: remove inlines, allow compiler to choose
Auke Kok [Fri, 26 May 2006 16:35:52 +0000 (09:35 -0700)]
ixgb: remove inlines, allow compiler to choose

deinline a few large functions as to allow the compiler to pick.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: remove lock access in the fast path
Auke Kok [Fri, 26 May 2006 16:35:47 +0000 (09:35 -0700)]
ixgb: remove lock access in the fast path

This mimics a change made in the e1000 driver that imitates a slick
tg3 way of avoiding grabbing the lock around restarting the tx queue.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: allocate only buffersize needed
Auke Kok [Fri, 26 May 2006 16:35:43 +0000 (09:35 -0700)]
ixgb: allocate only buffersize needed

In order to help correct window size growth, use the MFS register
to limit the packet sizes received and allocate only the buffer
size necessary

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
index 0905a82..84a8064 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -574,9 +574,8 @@ ixgb_sw_init(struct ixgb_adapter *adapte
  hw->subsystem_vendor_id = pdev->subsystem_vendor;
  hw->subsystem_id = pdev->subsystem_device;

- adapter->rx_buffer_len = IXGB_RXBUFFER_2048;
-
  hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
+ adapter->rx_buffer_len = hw->max_frame_size;

  if((hw->device_id == IXGB_DEVICE_ID_82597EX)
     || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4)
@@ -820,21 +819,14 @@ ixgb_setup_rctl(struct ixgb_adapter *ada

  rctl |= IXGB_RCTL_SECRC;

- switch (adapter->rx_buffer_len) {
- case IXGB_RXBUFFER_2048:
- default:
+ if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048)
  rctl |= IXGB_RCTL_BSIZE_2048;
- break;
- case IXGB_RXBUFFER_4096:
+ else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096)
  rctl |= IXGB_RCTL_BSIZE_4096;
- break;
- case IXGB_RXBUFFER_8192:
+ else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192)
  rctl |= IXGB_RCTL_BSIZE_8192;
- break;
- case IXGB_RXBUFFER_16384:
+ else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384)
  rctl |= IXGB_RCTL_BSIZE_16384;
- break;
- }

  IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
 }
@@ -1551,25 +1543,12 @@ ixgb_change_mtu(struct net_device *netde
  DPRINTK(PROBE, ERR, "Invalid MTU setting %d\n", new_mtu);
  return -EINVAL;
  }
-
- if((max_frame <= IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)
-    || (max_frame <= IXGB_RXBUFFER_2048)) {
- adapter->rx_buffer_len = IXGB_RXBUFFER_2048;
-
- } else if(max_frame <= IXGB_RXBUFFER_4096) {
- adapter->rx_buffer_len = IXGB_RXBUFFER_4096;

- } else if(max_frame <= IXGB_RXBUFFER_8192) {
- adapter->rx_buffer_len = IXGB_RXBUFFER_8192;
+ adapter->rx_buffer_len = max_frame;

- } else {
- adapter->rx_buffer_len = IXGB_RXBUFFER_16384;
- }
-
  netdev->mtu = new_mtu;
-
- if(old_max_frame != max_frame && netif_running(netdev)) {

+ if ((old_max_frame != max_frame) && netif_running(netdev)) {
  ixgb_down(adapter, TRUE);
  ixgb_up(adapter);
  }

18 years agoixgb: revert an unwanted fix regarding tso/descriptors
Auke Kok [Fri, 26 May 2006 16:35:38 +0000 (09:35 -0700)]
ixgb: revert an unwanted fix regarding tso/descriptors

There seemed to be another bug introduced as well as a performance hit
with the addtion of the sentinel descriptor workaround.  Removal of
this workaround appears to prevent the hang.  We'll take a risk
and remove it, as we had never seen the originally reported bug
under linux.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: fix interface losing macaddr on ifdn/up
Auke Kok [Fri, 26 May 2006 16:35:32 +0000 (09:35 -0700)]
ixgb: fix interface losing macaddr on ifdn/up

user contributed fix for LAA across down/up, from tonychung00@users.sf.net.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: fix smp polling race condition
Auke Kok [Fri, 26 May 2006 16:35:28 +0000 (09:35 -0700)]
ixgb: fix smp polling race condition

Moved interrupt masking to before requesting the interrupt from the OS.
Moved interrupt enable to after netif_poll_enable.  This fixes a racy
BUG() where polling would be running on another CPU at the same time
that netif_poll_enable would run.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years ago[IRDA]: *_DONGLE should depend on IRTTY_SIR
Samuel Ortiz [Thu, 25 May 2006 23:17:53 +0000 (16:17 -0700)]
[IRDA]: *_DONGLE should depend on IRTTY_SIR

If a SIR dongle is built in the kernel while IRTTY_SIR is built
as a module, kernel compilation will fail.
Thus, the SIR dongle config should depend on the IRTTY_SIR.

Closes kernel bug# 6512
(http://bugzilla.kernel.org/show_bug.cgi?id=6512)

Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[MAINTAINERS]: Add entry for netem
Stephen Hemminger [Thu, 25 May 2006 23:14:43 +0000 (16:14 -0700)]
[MAINTAINERS]: Add entry for netem

It gets enough reports, that there ought to be a MAINTAINER entry.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoixgb: increment version to 1.0.104-k4
Auke Kok [Thu, 25 May 2006 20:24:27 +0000 (13:24 -0700)]
ixgb: increment version to 1.0.104-k4

Increment the driver version to 1.0.104-k4

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: use rx copybreak/skb recycle
Auke Kok [Thu, 25 May 2006 20:24:21 +0000 (13:24 -0700)]
ixgb: use rx copybreak/skb recycle

o use rx copybreak/skb recycle

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years agoixgb: add performance enhancements to the buffer_info struct
Auke Kok [Thu, 25 May 2006 20:24:17 +0000 (13:24 -0700)]
ixgb: add performance enhancements to the buffer_info struct

o modify the rx refill logic and tail bump
o add counter for failures

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
18 years ago[PATCH] s390: fix typo in stop_hz_timer.
Martin Schwidefsky [Tue, 23 May 2006 07:22:42 +0000 (09:22 +0200)]
[PATCH] s390: fix typo in stop_hz_timer.

Add missing parentheses for type cast to u64.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoLinux 2.6.17-rc5 v2.6.17-rc5
Linus Torvalds [Thu, 25 May 2006 01:50:17 +0000 (18:50 -0700)]
Linux 2.6.17-rc5

18 years ago[PATCH] V4L/DVB (4045): Fixes recursive dependency for I2C
Jean Delvare [Wed, 24 May 2006 18:13:14 +0000 (15:13 -0300)]
[PATCH] V4L/DVB (4045): Fixes recursive dependency for I2C

Mixing "depends on I2C" and "select I2C" within the media subsystem
leads to the following problem:
Warning! Found recursive dependency: I2C DVB_BUDGET DVB_BUDGET_PATCH
DVB_AV7110 VIDEO_SAA7146_VV VIDEO_SAA7146 I2C

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoIB/mthca: Fix posting lists of 256 receive requests to SRQ for Tavor
Michael S. Tsirkin [Wed, 24 May 2006 15:27:07 +0000 (18:27 +0300)]
IB/mthca: Fix posting lists of 256 receive requests to SRQ for Tavor

If we post a list of length exactly a multiple of 256, nreq in
doorbell gets set to 256 which is wrong: it should be encoded by 0.
This is because we only zero it out on the next WR, which may not be
there.  The solution is to ring the doorbell after posting a WQE, not
before posting the next one.

This is the same bug that we just fixed for QPs with non-shared RQ.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Wed, 24 May 2006 15:55:12 +0000 (08:55 -0700)]
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ipath: deref correct pointer when using kernel SMA
  IB/ipath: fix null deref during rdma ops
  IB/ipath: register as IB device owner
  IB/ipath: enable PE800 receive interrupts on user ports
  IB/ipath: enable GPIO interrupt on HT-460
  IB/ipath: fix NULL dereference during cleanup
  IB/ipath: replace uses of LIST_POISON
  IB/ipath: fix reporting of driver version to userspace
  IB/ipath: don't modify QP if changes fail
  IB/ipath: fix spinlock recursion bug

18 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
Linus Torvalds [Wed, 24 May 2006 15:37:03 +0000 (08:37 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  JFS: Fix multiple errors in metapage_releasepage

18 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 24 May 2006 15:36:31 +0000 (08:36 -0700)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64)

18 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 24 May 2006 15:36:03 +0000 (08:36 -0700)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] sky2: fix jumbo packet support

18 years ago[MMC] Fix premature use of md->disk
Pierre Ossman [Wed, 24 May 2006 08:20:45 +0000 (10:20 +0200)]
[MMC] Fix premature use of md->disk

md->disk was being used in a debug message before it was allocated.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoJFS: Fix multiple errors in metapage_releasepage
Dave Kleikamp [Wed, 24 May 2006 12:43:38 +0000 (07:43 -0500)]
JFS: Fix multiple errors in metapage_releasepage

It looks like metapage_releasepage was making in invalid assumption that
the releasepage method would not be called on a dirty page.  Instead of
issuing a warning and releasing the metapage, it should return 0, indicating
that the private data for the page cannot be released.

I also realized that metapage_releasepage had the return code all wrong.  If
it is successful in releasing the private data, it should return 1, otherwise
it needs to return 0.

Lastly, there is no need to call wait_on_page_writeback, since
try_to_release_page will not call us with a page in writback state.

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
18 years ago[PATCH] phy: new SMSC LAN83C185 PHY driver
Herbert Valerio Riedel [Sun, 7 May 2006 21:22:53 +0000 (23:22 +0200)]
[PATCH] phy: new SMSC LAN83C185 PHY driver

new SMSC LAN83C185 10BaseT/100BaseTX PHY driver for the PHY subsystem

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64)
Albert Lee [Mon, 22 May 2006 03:43:46 +0000 (11:43 +0800)]
[PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64)

Backport the "pio flush" from the libata major update to 2.6.17 for via atapi.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[netdrvr ibmlana, ibmveth] trim trailing whitespace
Jeff Garzik [Wed, 24 May 2006 05:31:14 +0000 (01:31 -0400)]
[netdrvr ibmlana, ibmveth] trim trailing whitespace

18 years ago[PATCH] ibmveth change buffer pools dynamically
Santiago Leon [Tue, 25 Apr 2006 16:19:59 +0000 (11:19 -0500)]
[PATCH] ibmveth change buffer pools dynamically

This patch provides a sysfs interface to change some properties of the
ibmveth buffer pools (size of the buffers, number of buffers per pool,
and whether a pool is active).  Ethernet drivers use ethtool to provide
this type of functionality.  However, the buffers in the ibmveth driver
can have an arbitrary size (not only regular, mini, and jumbo which are
the only sizes that ethtool can change), and also ibmveth can have an
arbitrary number of buffer pools

Under heavy load we have seen dropped packets which obviously kills TCP
performance.  We have created several fixes that mitigate this issue,
but we definitely need a way of changing the number of buffers for an
adapter dynamically.  Also, changing the size of the buffers allows
users to change the MTU to something big (bigger than a jumbo frame)
greatly improving performance on partition to partition transfers.

The patch creates directories pool1...pool4 in the device directory in
sysfs, each with files: num, size, and active (which default to the
values in the mainline version).

Comments and suggestions are welcome...
--
Santiago A. Leon
Power Linux Development
IBM Linux Technology Center

Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] drivers/net/s2io.c: make bus_speed[] static
Adrian Bunk [Tue, 16 May 2006 15:30:50 +0000 (17:30 +0200)]
[PATCH] drivers/net/s2io.c: make bus_speed[] static

On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.17-rc3-mm1:
>...
>  git-netdev-all.patch
>...
>  git trees
>...

This patch makes the needlessly global bus_speed[] static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'upstream-fixes' into upstream
Jeff Garzik [Wed, 24 May 2006 05:28:05 +0000 (01:28 -0400)]
Merge branch 'upstream-fixes' into upstream

18 years ago[PATCH] sky2: fix jumbo packet support
Stephen Hemminger [Mon, 22 May 2006 19:03:42 +0000 (12:03 -0700)]
[PATCH] sky2: fix jumbo packet support

The truncate threshold calculation to prevent receiver from getting stuck
was incorrect, and it didn't take into account the upper limit on bits
in the register so the jumbo packet support was broken.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
Jeff Garzik [Wed, 24 May 2006 04:29:57 +0000 (00:29 -0400)]
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

18 years ago[netdrvr pcnet_cs, myri] trim trailing whitespace
Jeff Garzik [Wed, 24 May 2006 04:28:37 +0000 (00:28 -0400)]
[netdrvr pcnet_cs, myri] trim trailing whitespace

18 years ago[PATCH] pcnet_cs: Add TRENDnet TE-CF100 ethernet adapter ID
Marcin Juszkiewicz [Tue, 23 May 2006 09:15:57 +0000 (11:15 +0200)]
[PATCH] pcnet_cs: Add TRENDnet TE-CF100 ethernet adapter ID

Add TRENDnet TE-CF100 ethernet adapter to pcnet_cs list.

product info: "Fast Ethernet", "CF Size PC Card", "1.0", ""
 manfid: 0x0149, 0xc1ab

Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
 drivers/net/pcmcia/pcnet_cs.c |    2 ++
 1 file changed, 2 insertions(+)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] Add Myri-10G Ethernet driver
Brice Goglin [Tue, 23 May 2006 10:10:15 +0000 (06:10 -0400)]
[PATCH] Add Myri-10G Ethernet driver

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew J. Gallatin <gallatin@myri.com>
 drivers/net/Kconfig                            |   17
 drivers/net/Makefile                           |    1
 drivers/net/myri10ge/Makefile                  |    5
 drivers/net/myri10ge/myri10ge.c                | 2851 +++++++++++++++
 drivers/net/myri10ge/myri10ge_mcp.h            |  205 +
 drivers/net/myri10ge/myri10ge_mcp_gen_header.h |   58
 include/linux/pci_ids.h                        |    1
 7 files changed, 3138 insertions(+)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years ago[PATCH] Revive pci_find_ext_capability
Brice Goglin [Tue, 23 May 2006 10:10:01 +0000 (06:10 -0400)]
[PATCH] Revive pci_find_ext_capability

This patch revives pci_find_ext_capability (has been disabled a couple month
ago since it was not used anywhere. See http://lkml.org/lkml/2006/1/20/247).
It will now be used by the myri10ge driver.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Andrew J. Gallatin <gallatin@myri.com>
 drivers/pci/pci.c   |    3 +--
 include/linux/pci.h |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
18 years agoMerge branch 'master' into upstream
Jeff Garzik [Wed, 24 May 2006 04:27:05 +0000 (00:27 -0400)]
Merge branch 'master' into upstream

18 years ago[BRIDGE]: need to ref count the LLC sap
Stephen Hemminger [Tue, 23 May 2006 22:20:25 +0000 (15:20 -0700)]
[BRIDGE]: need to ref count the LLC sap

Bridge will OOPS on removal if other application has the SAP open.
The bridge SAP might be shared with other usages, so need
to do reference counting on module removal rather than explicit
close/delete.

Since packet might arrive after or during removal, need to clear
the receive function handle, so LLC only hands it to user (if any).

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETFILTER]: SNMP NAT: fix memleak in snmp_object_decode
Chris Wright [Tue, 23 May 2006 22:08:13 +0000 (15:08 -0700)]
[NETFILTER]: SNMP NAT: fix memleak in snmp_object_decode

If kmalloc fails, error path leaks data allocated from asn1_oid_decode().

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETFILTER]: H.323 helper: fix sequence extension parsing
Patrick McHardy [Tue, 23 May 2006 22:07:46 +0000 (15:07 -0700)]
[NETFILTER]: H.323 helper: fix sequence extension parsing

When parsing unknown sequence extensions the "son"-pointer points behind
the last known extension for this type, don't try to interpret it.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NETFILTER]: H.323 helper: fix parser error propagation
Patrick McHardy [Tue, 23 May 2006 22:07:07 +0000 (15:07 -0700)]
[NETFILTER]: H.323 helper: fix parser error propagation

The condition "> H323_ERROR_STOP" can never be true since H323_ERROR_STOP
is positive and is the highest possible return code, while real errors are
negative, fix the checks. Also only abort on real errors in some spots
that were just interpreting any return value != 0 as error.

Fixes crashes caused by use of stale data after a parsing error occured:

BUG: unable to handle kernel paging request at virtual address bfffffff
 printing eip:
c01aa0f8
*pde = 1a801067
*pte = 00000000
Oops: 0000 [#1]
PREEMPT
Modules linked in: ip_nat_h323 ip_conntrack_h323 nfsd exportfs sch_sfq sch_red cls_fw sch_hfsc  xt_length ipt_owner xt_MARK iptable_mangle nfs lockd sunrpc pppoe pppoxx
CPU:    0
EIP:    0060:[<c01aa0f8>]    Not tainted VLI
EFLAGS: 00210646   (2.6.17-rc4 #8)
EIP is at memmove+0x19/0x22
eax: d77264e9   ebx: d77264e9   ecx: e88d9b17   edx: d77264e9
esi: bfffffff   edi: bfffffff   ebp: de6a7680   esp: c0349db8
ds: 007b   es: 007b   ss: 0068
Process asterisk (pid: 3765, threadinfo=c0349000 task=da068540)
Stack: <0>00000006 c0349e5e d77264e3 e09a2b4e e09a38a0 d7726052 d7726124 00000491
       00000006 00000006 00000006 00000491 de6a7680 d772601e d7726032 c0349f74
       e09a2dc2 00000006 c0349e5e 00000006 00000000 d76dda28 00000491 c0349f74
Call Trace:
 [<e09a2b4e>] mangle_contents+0x62/0xfe [ip_nat]
 [<e09a2dc2>] ip_nat_mangle_tcp_packet+0xa1/0x191 [ip_nat]
 [<e0a2712d>] set_addr+0x74/0x14c [ip_nat_h323]
 [<e0ad531e>] process_setup+0x11b/0x29e [ip_conntrack_h323]
 [<e0ad534f>] process_setup+0x14c/0x29e [ip_conntrack_h323]
 [<e0ad57bd>] process_q931+0x3c/0x142 [ip_conntrack_h323]
 [<e0ad5dff>] q931_help+0xe0/0x144 [ip_conntrack_h323]
...

Found by the PROTOS c07-h2250v4 testsuite.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoMerge branch 'e1000-7.0.38-k4' of git://lost.foo-projects.org/~ahkok/git/netdev-2...
Jeff Garzik [Tue, 23 May 2006 21:21:33 +0000 (17:21 -0400)]
Merge branch 'e1000-7.0.38-k4' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream

18 years agoMerge branch 'master' into upstream
Jeff Garzik [Tue, 23 May 2006 21:20:58 +0000 (17:20 -0400)]
Merge branch 'master' into upstream

18 years agoe1000: bump version to 7.0.38-k4
Auke Kok [Tue, 23 May 2006 20:36:19 +0000 (13:36 -0700)]
e1000: bump version to 7.0.38-k4

Signed-off-by: Auke Kok <auke.jan.h.kok@intel.com>
18 years agoe1000: remove changelog in driver
Auke Kok [Tue, 23 May 2006 20:36:14 +0000 (13:36 -0700)]
e1000: remove changelog in driver

This honours the request to remove the changelog in the driver code.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
18 years agoe1000: Fix date string in Makefile
Auke Kok [Tue, 23 May 2006 20:36:10 +0000 (13:36 -0700)]
e1000: Fix date string in Makefile

I forgot to update the date string in the Makefile last time.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
18 years agoe1000: remove leading and trailing whitespace.
Auke Kok [Tue, 23 May 2006 20:36:06 +0000 (13:36 -0700)]
e1000: remove leading and trailing whitespace.

Some leading and trailing whitespace made it into the driver code here.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
18 years agoe1000: remove backslash r debug printfs
Auke Kok [Tue, 23 May 2006 20:36:01 +0000 (13:36 -0700)]
e1000: remove backslash r debug printfs

This removes unwanted characters in the debug output that should have
never been there.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
18 years agoe1000: add shutdown handler back to fix WOL
Auke Kok [Tue, 23 May 2006 20:35:57 +0000 (13:35 -0700)]
e1000: add shutdown handler back to fix WOL

Someone was waaay too aggressive and removed e1000's reboot notifier
instead of porting it to the new way of the shutdown handler.  This change
broke wake on lan.  Add the shutdown handler back in using the same method
as e100 uses.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
18 years agoIB/ipath: deref correct pointer when using kernel SMA
Bryan O'Sullivan [Tue, 23 May 2006 18:32:38 +0000 (11:32 -0700)]
IB/ipath: deref correct pointer when using kernel SMA

At this point, the core QP structure hasn't been initialized, so what's
in there isn't valid.  Get the same information elsewhere.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: fix null deref during rdma ops
Bryan O'Sullivan [Tue, 23 May 2006 18:32:37 +0000 (11:32 -0700)]
IB/ipath: fix null deref during rdma ops

The problem was that node A's sending thread, which handles sending RDMA
read response data, would write the trigger word, the last packet would
be sent, node B would send a new RDMA read request, node A's interrupt
handler would initialize s_rdma_sge, then node A's sending thread would
update s_rdma_sge.  This didn't happen very often naturally but was more
frequent with 1 byte RDMA reads.  Rather than adding more locking or
increasing the QP structure size and copying sge data, I modified the
copy routine to update the pointers before writing the trigger word to
avoid the update race.

Signed-off-by: Ralph Campbell <ralphc@pathscale.com>
Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: register as IB device owner
Bryan O'Sullivan [Tue, 23 May 2006 18:32:36 +0000 (11:32 -0700)]
IB/ipath: register as IB device owner

This fixes an oops.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: enable PE800 receive interrupts on user ports
Bryan O'Sullivan [Tue, 23 May 2006 18:32:35 +0000 (11:32 -0700)]
IB/ipath: enable PE800 receive interrupts on user ports

Fixed so it works on the PE-800.  It had not previously been updated to
match PE-800 receive interrupt differences from HT-400.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: enable GPIO interrupt on HT-460
Bryan O'Sullivan [Tue, 23 May 2006 18:32:34 +0000 (11:32 -0700)]
IB/ipath: enable GPIO interrupt on HT-460

This is required for even semi-decent performance on OpenIB.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: fix NULL dereference during cleanup
Bryan O'Sullivan [Tue, 23 May 2006 18:32:33 +0000 (11:32 -0700)]
IB/ipath: fix NULL dereference during cleanup

Fix NULL deref due to pcidev being clobbered before dd->ipath_f_cleanup()
was called.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: replace uses of LIST_POISON
Bryan O'Sullivan [Tue, 23 May 2006 18:32:32 +0000 (11:32 -0700)]
IB/ipath: replace uses of LIST_POISON

Per Andrew's request.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: fix reporting of driver version to userspace
Bryan O'Sullivan [Tue, 23 May 2006 18:32:31 +0000 (11:32 -0700)]
IB/ipath: fix reporting of driver version to userspace

Fix the interface version that gets exported to userspace.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: don't modify QP if changes fail
Bryan O'Sullivan [Tue, 23 May 2006 18:32:30 +0000 (11:32 -0700)]
IB/ipath: don't modify QP if changes fail

Make sure modify_qp won't modify the QP if any of the changes failed.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoIB/ipath: fix spinlock recursion bug
Bryan O'Sullivan [Tue, 23 May 2006 18:32:29 +0000 (11:32 -0700)]
IB/ipath: fix spinlock recursion bug

The local loopback path for RC can lock the rkey table lock without
blocking interrupts.  The receive interrupt path can then call
ipath_rkey_ok() and deadlock.  Remove the redundant lock.

Signed-off-by: Bryan O'Sullivan <bos@pathscale.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
18 years agoV4L/DVB (4041): Fix compilation on PPC 64
Mauro Carvalho Chehab [Tue, 23 May 2006 19:02:03 +0000 (16:02 -0300)]
V4L/DVB (4041): Fix compilation on PPC 64

Those functions don't exist on PPC64 architecture.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
18 years agoV4L/DVB (4040a): Fix the following section warnings:
Jean Delvare [Tue, 23 May 2006 18:56:50 +0000 (15:56 -0300)]
V4L/DVB (4040a): Fix the following section warnings:

reference to .init.text: from .text between 'dvb_bt8xx_probe'
(at offset 0x122c) and 'dvb_bt8xx_remove'
reference to .init.text: from .text between 'dvb_bt8xx_probe'
(at offset 0x1267) and 'dvb_bt8xx_remove'

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
18 years agoV4L/DVB (4037): Make the bridge devices that depend on I2C dependant on I2C
Manu Abraham [Sat, 20 May 2006 16:17:00 +0000 (13:17 -0300)]
V4L/DVB (4037): Make the bridge devices that depend on I2C dependant on I2C

Ref: Bugzilla 6179, 6589

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
18 years agoV4L/DVB (3927): Fix VIDEO_DEV=m, VIDEO_V4L1_COMPAT=y
Adrian Bunk [Tue, 23 May 2006 18:56:20 +0000 (15:56 -0300)]
V4L/DVB (3927): Fix VIDEO_DEV=m, VIDEO_V4L1_COMPAT=y

If CONFIG_VIDEO_DEV=m and CONFIG_VIDEO_V4L1_COMPAT=y, v4l1-compat should
be built as a module (currently, it isn't built at all leading to
problems with modules using it).

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 23 May 2006 17:40:43 +0000 (10:40 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Respect gfp_t argument to dma_alloc_coherent().

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 23 May 2006 17:40:19 +0000 (10:40 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: SNMP NAT: fix memory corruption
  [IRDA]: fixup type of ->lsap_state
  [IRDA]: fix 16/32 bit confusion
  [NET]: Fix "ntohl(ntohs" bugs
  [BNX2]: Use kmalloc instead of array
  [BNX2]: Fix bug in bnx2_nvram_write()
  [TG3]: Add some missing rx error counters

18 years ago[PATCH] blk: fix gendisk->in_flight accounting during barrier sequence
Jens Axboe [Tue, 23 May 2006 09:23:49 +0000 (11:23 +0200)]
[PATCH] blk: fix gendisk->in_flight accounting during barrier sequence

While executing barrrier sequence, the bar_rq which carries actual
write was accounted as normal IO on completion, while it wasn't on
queueing.  This caused gendisk->in_flight to be decremented by 1 after
each barrier thus messed up statistics.

This patch makes bar_rq not accounted as normal IO.  As the containing
barrier request as a whole is accounted, part of it shouldn't be.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>