summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6Linus Torvalds2005-10-287-34/+26
|\
| * Merge ../bleed-2.6Greg KH2005-10-28127-3933/+6572
| |\
| * | [PATCH] DRIVER MODEL: Get rid of the obsolete tri-level suspend/resume callbacksRussell King2005-10-285-32/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In PM v1, all devices were called at SUSPEND_DISABLE level. Then all devices were called at SUSPEND_SAVE_STATE level, and finally SUSPEND_POWER_DOWN level. However, with PM v2, to maintain compatibility for platform devices, I arranged for the PM v2 suspend/resume callbacks to call the old PM v1 suspend/resume callbacks three times with each level in order so that existing drivers continued to work. Since this is obsolete infrastructure which is no longer necessary, we can remove it. Here's an (untested) patch to do exactly that. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | [PATCH] Driver Core: fix up all callers of class_device_create()Greg Kroah-Hartman2005-10-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The previous patch adding the ability to nest struct class_device changed the paramaters to the call class_device_create(). This patch fixes up all in-kernel users of the function. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6Linus Torvalds2005-10-281-7/+23
|\ \ \ | |_|/ |/| |
| * | Auto-update from upstreamKyle McMartin2005-10-286-8/+9
| |\ \
| * | | [PARISC] Add NETPOLL support to lasi_82596Sven Schnelle2005-10-211-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add netpoll support Patch by Sven Schnelle <svens@gmx.de> Signed-off-by: Sven Schnelle <svens@gmx.de> Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] Convert parisc_device to use struct resource for hpaMatthew Wilcox2005-10-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert pa_dev->hpa from an unsigned long to a struct resource. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Fix up users of ->hpa to use ->hpa.start instead. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * | | [PARISC] Change the driver names so /sys/bus/parisc/drivers/ looks betterMatthew Wilcox2005-10-211-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Make /sys/bus/parisc/drivers look better by cleaning up parisc_driver names. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-10-287-3/+898
|\ \ \ | | | | | | | | | | | | Minor manual fixups for gfp_t clashes.
| * | | [ARM] 2897/2: PXA2xx IRDA supportNicolas Pitre2005-10-283-0/+882
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre This is the PXA2xx common IRDA driver, plus platform support for Lubbock and Mainstone. Signed-off-by: Nicolas Pitre <nico@cam.org> Acked-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 2919/1: CS8900A ethernet driver modifications for the Comdial MP1000Jon Ringle2005-10-283-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Jon Ringle This patch gives support for the CS8900A ethernet chip on the Comdial MP1000 Signed-off-by: Jon Ringle Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 2/4: Remove asm/hardware.h from asm-arm/arch-ebsa110/io.hRussell King2005-10-281-0/+1
| |/ / | | | | | | | | | | | | | | | | | | EBSA110 only requires hardware.h to be included for a couple of files. Move the include there. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'upstream' of ↵Linus Torvalds2005-10-28115-3922/+5665
|\ \ \ | |_|/ |/| | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * | [netdrvr forcedeth] scatter gather and segmentation offload supportAyaz Abdulla2005-10-261-87/+162
| | | | | | | | | | | | | | | | | | | | | also: - eliminate use of pointless get_nvpriv() wrapper, and use netdev_priv() directly. - use NETDEV_TX_xxx return codes
| * | [PATCH] sb1250-mac: PHY probing fixes.Ralf Baechle2005-10-201-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Improve sb1250-mac driver to probe for PHYs at addresses other than 1, such as the PHYs on BigSur. Signed-Off-By: Andy Isaacson <adi@broadcom.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | Merge branch 'master'Jeff Garzik2005-10-201-2/+3
| |\ \ | | |/
| * | [PATCH] e1000: Driver version, white space, comments, device id & otherMallikarjuna R Chilakala2005-10-201-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Driver version, white space, comments, device id & other Originally posted on 8/31 (and perhaps before)...I think it has not been committed because the patch from that posting was damaged. I'm reposting to make sure it gets in... :-) 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> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sundance: include MII address 0 in PHY probeJohn W. Linville2005-10-201-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Include MII address 0 at the end of the PHY scan. This covers the entire range of possible MII addresses. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sb1250-mac: Whitespace cleanup.Ralf Baechle2005-10-191-515/+515
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/sb1250-mac.c | 1030 +++++++++++++++++++++++------------------------ 1 files changed, 515 insertions(+), 515 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sb1250-mac: Get rid of all the funny SBMAC_WRITECSR and ↵Ralf Baechle2005-10-191-171/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SBMAC_READCSR macros. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/sb1250-mac.c | 303 ++++++++++++++++++++--------------------------- 1 files changed, 132 insertions(+), 171 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] Remove unused header.Ralf Baechle2005-10-191-62/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mkiss.h has been integrated into mkiss.c earlier. Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> drivers/net/hamradio/mkiss.h | 62 ------------------------------------------- 1 files changed, 62 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] e1000 build fixAndrew Morton2005-10-181-1/+1
| | | | | | | | | | | | | | | | | | Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sundance: expand reset maskJohn W. Linville2005-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Expand the mask used when reseting the chip to include the GlobalReset bit. This fix comes from ICPlus and seems to be required for some cards. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sundance: remove if (1) { ... } block in sundance_probe1John W. Linville2005-10-181-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an if (1) { ... } block in sundance_probe1. Its purpose seems to be only to allow for delaring some extra local variables. But, it also adds ugly indentation without adding any meaning to the code. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] orinoco: remove redundance skb length check before paddingJohn W. Linville2005-10-181-5/+3
| | | | | | | | | | | | | | | | | | | | | Checking the skb->len value before calling skb_padto is redundant. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] b44: alternate allocation option for DMA descriptorsJohn W. Linville2005-10-182-8/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a (final?) hack to support the odd DMA allocation requirements of the b44 hardware. The b44 hardware has a 30-bit DMA mask. On x86, anything less than a 32-bit DMA mask forces allocations into the 16MB GFP_DMA range. The memory there is somewhat limited, often resulting in an inability to initialize the b44 driver. This hack uses streaming DMA allocation APIs in order to provide an alternative in case the GFP_DMA allocation fails. It is somewhat ugly, but not much worse than the similar existing hacks to support SKB allocations in the same driver. FWIW, I have received positive feedback on this from several Fedora users. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] bonding: cleanup comment for mode 1 IGMP xmit hackJohn W. Linville2005-10-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Expand comment explaining MAC address selection for replicated IGMP frames transmitted in bonding mode 1 (active-backup). Also, a small whitespace cleanup. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] 8139too: fix resume for Realtek 8100B/8139DJohn W. Linville2005-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add "HasHltClk" flag for RTL-8100B/8139D hardware in order to fix problems resuming from suspend-to-RAM. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] epic100: fix counting of work_done in epic_pollJohn W. Linville2005-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | work_done is overwritten each time through the rx_action loop in epic_poll. This screws-up the NAPI accounting if the loop is executed more than once. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] via-rhine: change mdelay to msleep and remove from ISR pathJohn W. Linville2005-10-181-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the mdelay call in rhine_disable_linkmon. The function is called from the via-rhine versions of mdio_read and mdio_write. Those functions are indirectly called from rhine_check_media and rhine_tx_timeout, both of which can be called in interrupt context. So, create tx_timeout_task and check_media_task as instances of struct work_struct inside of rhine_private. Then, change rhine_tx_timeout to invoke schedule_work for tx_timeout_task (i.e. rhine_tx_timeout_task), moving the work to process context. Also, change rhine_error (invoked from rhine_interrupt) to invoke schedule_work for check_media_task (i.e. rhine_check_media_task), which simply calls rhine_check media in process context. Finally, add a call to flush_scheduled_work in rhine_close to avoid any resource conflicts with pending work items. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] s2io build fixAndrew Morton2005-10-181-1/+1
| | | | | | | | | | | | | | | | | | Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] e1000_intr build fixAndrew Morton2005-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/net/e1000/e1000_main.c: In function `e1000_intr': drivers/net/e1000/e1000_main.c:3156: error: `i' undeclared (first use in this function) drivers/net/e1000/e1000_main.c:3156: error: (Each undeclared identifier is reported only once drivers/net/e1000/e1000_main.c:3156: error: for each function it appears in.) This function is foul. Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] mipsnet: Virtual ethernet driver for MIPSsim.Ralf Baechle2005-10-184-0/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/Kconfig | 8 + drivers/net/Makefile | 1 drivers/net/mipsnet.c | 371 ++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/mipsnet.h | 127 +++++++++++++++++ 4 files changed, 507 insertions(+) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] ne: Support for RBHMA4500 eval board.Ralf Baechle2005-10-181-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for Toshiba's RBHMA4500 eval board for the TX4938. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/ne.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] declance: Use physical addresses at the interface level.Ralf Baechle2005-10-181-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use physical addresses at the interface level, letting drivers remap them as appropriate. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/declance.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] declance: Deal with the bloody KSEG vs CKSEG horror...Ralf Baechle2005-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/declance.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] declance: Fix mapping of device.Ralf Baechle2005-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should really be addresses obtained with ioremap() or some bus-specific backend, but for now... Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/declance.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] declance: Convert to irqreturn_t.Ralf Baechle2005-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/declance.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sgiseeq: Configure PIO and DMA timing requests.Ralf Baechle2005-10-181-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/sgiseeq.c | 28 ++++++++++++++-------------- include/asm-mips/sgi/hpc3.h | 40 ++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 34 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sgiseeq: Fix resource handling.Ralf Baechle2005-10-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/sgiseeq.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] de2104x: Resurrect Cobalt support for 2.6.Ralf Baechle2005-10-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/tulip/de2104x.c | 5 +++++ 1 files changed, 5 insertions(+) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] au1000_eth: Misc Au1000 net driver fixes.Ralf Baechle2005-10-181-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Add support for DP83847 MII. o remove unused variable. o Add some initialisations so even an unknown MII won't result in a crash. o Correct error message to "no known MIIs found". Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/au1000_eth.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sb1250-mac: Ensure 16-byte alignment of the descriptor ring.Ralf Baechle2005-10-181-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/sb1250-mac.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletion(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | [PATCH] sb1250-mac: Check the actual setting for reporting hw checksumming.Ralf Baechle2005-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/sb1250-mac.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | Merge branch 'master'Jeff Garzik2005-10-181-1/+1
| |\ \
| * | | [PATCH] Initialize the .owner field the tty_ldisc structure.Ralf Baechle2005-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If .owner isn't set the module can be unloaded even while still active. Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] SMACK support for mkissRalf Baechle2005-10-182-31/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMACK (Stuttgart Modified Amateurradio CRC KISS) is a KISS variant that uses CRC16 checksums to secure data transfers between the modem and host. It's also used to communicate over a pty to applications such as Wampes. Patches for Linux 2.4 by Thomas Osterried DL9SAU, upgraded to the latest mkiss 2.6 mkiss driver by me. Signed-off-by: Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de> Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] rcu in bpqether driver.Ralf Baechle2005-10-181-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Suzanne Wood <suzannew@cs.pdx.edu>: Clarify RCU implementation in bpqether.c. Because bpq_new_device() calls list_add_rcu() and bpq_free_device() calls list_del_rcu(), substitute list_for_each_entry_rcu() for list_for_each_entry() in bpq_get_ax25_dev() and in bpq_seq_start(). Add rcu dereference protection in bpq_seq_next(). The rcu_read_lock()/unlock() in bpq_device_event() are removed because netdev event handlers are called with RTNL locking in place. FYI: bpq_free_device() calls list_del_rcu() which, per list.h, requires synchronize_rcu() which can block or call_rcu() or call_rcu_bh() which cannot block. Herbert Xu notes that synchronization is done here by unregister_netdevice(). This calls synchronize_net() which in turn uses synchronize_rcu(). Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] S2io: Offline diagnostics fixesravinandan.arakali@neterion.com2005-10-182-80/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following bugs with offline diagnostics code(run with "ethtool -t"). 1. After running offline diagnostics, adapter would report corrupted packets on receive. This was because of adapter not being brought out of "RLDRAM test mode". 2. Current EEPROM test works only for Xframe I. Since Xframe II uses different interface(SPI), support for this interface has been added. Also, since SPI supports write access to all areas of EEPROM, negative testing is done only for Xframe I. 3. Return values from subfunctions of offline diagnostics have been corrected. 4. In register test, expected value from rx_queue_cfg register is made to depend on adapter type. 5. After the test, need to restore values at EEPROM offsets 0x4F0 and 0x7F0. These locations were modified as part of test. 6. Use macro SPECIAL_REG_WRITE for write access to mc_rldram_test_ctrl register. Also, couple of unnecessary writes to mc_rldram_test_ctrl have been removed. Signed-off-by: Ravinandan Arakali <ravinandan.arakali@neterion.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
OpenPOWER on IntegriCloud