Commit Graph

803 Commits

Author SHA1 Message Date
James Ketrenos
4ca5253d57 [PATCH] ieee80211: Updated atmel to be compatible with ieee80211_hdr changes
tree d7be83000b058b14450d76f99c432b1fb2a1c177
parent 322201093e03830fceedfc24931420b1ea855a8c
author James Ketrenos <jketreno@linux.intel.com> 1127316330 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127316330 -0500

Updated atmel to be compatible with ieee80211_hdr changes.

Change accomplished via:

sed -i -e "s:ieee80211_hdr\([^_]\):ieee80211_hdr_4addr\1:g" \
	drivers/net/wireless/atmel.c

Compile tested only.

CC: simon@thekelleys.org.uk

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-21 23:00:58 -04:00
James Ketrenos
c8d42d1ae4 [PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211's hard_start_xmit change.
tree 713b6ff3311decfe42d5209f7b2508736d144b85
parent 6465beff0e89779330450dffc2a5e6dc5154eebf
author James Ketrenos <jketreno@linux.intel.com> 1126716726 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127316162 -0500

Updated ipw2200 to be compatible with ieee80211's hard_start_xmit change.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-21 23:00:57 -04:00
James Ketrenos
0dacca1f0a [PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211_hdr changes
tree 9f86c7b4f59249c05c96c360dfaa817995e8a44f
parent 9b09701b2c6254f2fddb009004a14eb5a908714f
author James Ketrenos <jketreno@linux.intel.com> 1126714305 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127316074 -0500

Updated ipw2200 to be compatible with ieee80211_hdr changes.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-21 23:00:57 -04:00
James Ketrenos
3a5becf720 [PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211's hard_start_xmit change
tree ee48cbe413b795d6be454b9baf4f3bd3d74814cb
parent 49856b147763bd6847e0d8f53aee1ddd61385638
author James Ketrenos <jketreno@linux.intel.com> 1126716634 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127316024 -0500

Updated ipw2100 to be compatible with ieee80211's hard_start_xmit change.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-21 23:00:57 -04:00
James Ketrenos
99a4b232b6 [PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211_hdr changes
tree 992b203395c50342f1cced415acae6177344e270
parent c59bb604a2ff4e40232ff0422e7adc44e3b007a0
author James Ketrenos <jketreno@linux.intel.com> 1126714006 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127315910 -0500

Updated ipw2100 to be compatible with ieee80211_hdr changes.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-21 23:00:57 -04:00
Jeff Garzik
a3536c839f Merge /spare/repo/linux-2.6/ 2005-09-21 22:34:08 -04:00
Krzysztof Halasa
2cf655cd65 [WAN] hdlc_cisco: Fix regression introduced by skb->tail changes.
The following commit breaks cisco mode with my WAN drivers:
author	David S. Miller <davem@davemloft.net>
	Tue, 28 Jun 2005 22:25:31 +0000 (15:25 -0700)
commit	689be43945

"[NET]: Remove gratuitous use of skb->tail in network drivers."

The following patch fixes it - please apply (cisco_hard_header does
skb_push(4 bytes)).

Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-19 15:39:32 -07:00
Florin Malita
40abc27066 [BOND]: Fix bond_init() error path handling.
From: Florin Malita <fmalita@gmail.com>

bond_init() is not releasing rtnl_sem after register_netdevice() and before
calling unregister_netdevice() (from bond_free_all()) in the exception
path.  As the device registration is not completed (dev->reg_state ==
NETREG_REGISTERING), the call to unregister_netdevice() triggers
BUG_ON(dev->reg_state != NETREG_REGISTERED).

Signed-off-by: Florin Malita <fmalita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-18 00:24:12 -07:00
David S. Miller
21f130a237 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2005-09-18 00:17:10 -07:00
Michael Chan
c58ec93245 [TG3]: Fix 4GB boundary tx handling
Fix and simplify the workaround code for the 4GB boundary tx buffer
hardware bug.

1. Need to unmap the original SKB's dma addresses if a new SKB cannot
   be allocated.

2. Need to pass the base flag to tigon3_4gb_hwbug_workaround() or TSO
   won't work properly.

3. The guilty entry and length parameters for
   tigon3_4gb_hwbug_workaround() are removed as they are not necessary.

4. Remove assumption that only one fragment can hit the 4GB boundary.
   Another fragment can hit 8GB for example.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-17 00:46:27 -07:00
Peter Hagervall
22abe310bc [TG3]: Sparse fixes for tg3
Change 0 to NULL where appropriate.

Signed-off-by: Peter Hagervall <hager@cs.umu.se>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-16 17:01:03 -07:00
David S. Miller
1cbf07478b [TG3]: Add AMD K8 to list of write-reorder chipsets.
Thanks to Andy Stewart for the report and testing
debug patches from Michael Chan.

Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-16 16:59:20 -07:00
Jens Osterkamp
53abbf7eea [PATCH] net: fix spider_net media detection
This patch makes the driver work with any BladeCenter
network switch, it used to work only with certain
models.

Please apply.

Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 03:23:12 -04:00
James Ketrenos
a33a198201 [PATCH] Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change
author James Ketrenos <jketreno@linux.intel.com> 1126713327 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1126713327 -0500

Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 03:15:57 -04:00
Pavel Roskin
9c8a11d7c2 [PATCH] orinoco: Update PCMCIA ID's.
Author: Pavel Roskin <proski@gnu.org>
Date:   Fri Sep 16 01:07:47 2005 -0400

    Update PCMCIA ID's.

    Intel Pro/Wireless 2011 and 2011B have the same numeric ID, so use
    strings instead.

    Take all entries from *.conf for Orinoco, HostAP and linux-wlan-ng and
    adds them with minimal changes (e.g. we don't need a revision string
    after a string that identifies the chipset).

    Add comments with card names to all numeric entries.  Note: the comments
    don't and cannot cover all cards, since the main reason of having
    numeric IDs is to cover cards that are often rebranded.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 02:56:36 -04:00
Pavel Roskin
27c91efba4 [PATCH] orinoco: Don't include <net/ieee80211.h> twice.
Author: Pavel Roskin <proski@gnu.org>
Date:   Fri Sep 16 00:50:00 2005 -0400

    Don't include <net/ieee80211.h> twice.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 02:56:36 -04:00
Pavel Roskin
65853b133d [PATCH] orinoco: Remove conditionals that are useless in the kernel drivers.
Author: Pavel Roskin <proski@gnu.org>
Date:   Fri Sep 16 00:49:05 2005 -0400

    Remove conditionals that are useless in the kernel drivers.

    Kernel drivers are never compiled against pcmcia-cs headers.
    Firmware is never embedded into spectrum_cs module.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 02:56:36 -04:00
Stephen Hemminger
8b51292764 [PATCH] 8139cp: allocate statistics space only when needed
Don't crash if ethtool statistics are requested and device is down.
Fix is to allocate pci space for statistics only when needed.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 02:51:31 -04:00
Jay Vosburgh
ed4b9f8014 [PATCH] bonding: plug reference count leak
Bonding leaks route structures when the ARP monitor is
configured to send probes over VLANs.

	Originally reported by Ian Abel <ian.abel@mxtelecom.com>; his
original fix was modified by Jay Vosburgh to correct coding style and to
close a leak it missed.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 02:46:41 -04:00
Hubert WS Lin
76209926e3 [PATCH] pcnet32: set min ring size to 4
Don Fry reminded me that the pcnet32_loopback_test() asssumes the ring size
is no less than 4.  The minimum ring size was changed to 4 in
pcnet32_set_ringparam() to allow the loopback test to work unchanged.

- Set minimum ring size to 4 to allow loopback test to work unchanged
- Moved variable init_block to first field in struct pcnet32_private

Signed-off-by: Hubert WS Lin <wslin@tw.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 02:43:23 -04:00
Hubert WS Lin
eabf041516 [PATCH] pcnet32: set_ringparam implementation
This patch implements the set_ringparam(), one of the ethtool operations,
which allows changing tx/rx ring sizes via ethtool.

- Changed memery allocation of tx/rx ring from static to dynamic
- Implemented set_ringparam()
- Tested on i386 and ppc64

Signed-off-by: Hubert WS Lin <wslin@tw.ibm.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-16 02:43:23 -04:00
Matt Porter
f89efd523b [PATCH] Add rapidio net driver
Adds an "Ethernet" driver which sends Ethernet packets over the standard
RapidIO messaging.  This depends on the core RIO patch for mailbox/doorbell
access.

Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 09:18:21 -04:00
Dale Farnsworth
43ec6e95e4 [PATCH] mii: Add test for GigE support
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:46:21 -04:00
viro@ZenIV.linux.org.uk
7a700fafbe [PATCH] C99 initializers in ray_cs.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:37:49 -04:00
viro@ZenIV.linux.org.uk
387d890db8 [PATCH] lne390 bogus casts
We already have the iomem pointer we need...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:37:31 -04:00
Adrian Bunk
7665a08928 [PATCH] drivers/net/wan/: possible cleanups
This patch contains possible cleanups including the following:
- make needlessly global code static
- #if 0 the following unused global function:
  - sdladrv.c: sdla_intde
- remove the following unused global variable:
  - lmc_media.c: lmc_t1_cables
- remove the following unneeded EXPORT_SYMBOL's:
  - cycx_drv.c: cycx_inten
  - sdladrv.c: sdla_inten
  - sdladrv.c: sdla_intde
  - sdladrv.c: sdla_intack
  - sdladrv.c: sdla_intr
  - syncppp.c: sppp_input
  - syncppp.c: sppp_change_mtu

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:36:54 -04:00
Tobias Klauser
8e18d1f9c9 [PATCH] Replace drivers/net/wan custom ctype macros with standard ones
Replace the custom is_digit()/is_hex_digit() macros with
isdigit()/isxdigit() from <linux/ctype.h> Additionaly remove unused macro
is_alpha() from <linux/wanpipe.h>

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:35:09 -04:00
Nishanth Aravamudan
3173c8907f [PATCH] drivers/net: fix-up schedule_timeout() usage
Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:33:24 -04:00
Stephen Hemminger
46a60f2d71 [PATCH] skge: gmac register access errors in dual port
Merge of four previous patches and the Kconfig fix
 * Remove debug printk's
 * whitespace cleanup and version number change
 * clear interrupts, reset phy, and reset hardware on shutdown
 * ignore 64bit counter overflow interrupts
 * fix a couple of places where second port could clobber state
   of first port.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:32:07 -04:00
Pavel Roskin
343c686c04 [PATCH] orinoco: WE-18 support
Author: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Pavel Roskin <proski@gnu.org>

Use new Wireless Extension API for wireless stats.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:30:54 -04:00
John W. Linville
b81e8e1f4a [PATCH] via-rhine: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to via-rhine.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:30:02 -04:00
John W. Linville
30d60a8288 [PATCH] sundance: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to sundance.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:30:02 -04:00
John W. Linville
56230d5382 [PATCH] skge: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to skge.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:30:02 -04:00
John W. Linville
6d6525b7f7 [PATCH] r8169: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to r8169.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:30:02 -04:00
John W. Linville
db0276b060 [PATCH] pcnet32: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to pcnet32.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:30:01 -04:00
John W. Linville
78b345890a [PATCH] ne2k-pci: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to ne2k-pci.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:32 -04:00
John W. Linville
df859c519e [PATCH] ixgb: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to ixgb.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:32 -04:00
John W. Linville
c704b8566b [PATCH] forcedeth: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to forcedeth.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:32 -04:00
John W. Linville
a92dd9233a [PATCH] e100: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to e100.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:32 -04:00
John W. Linville
9beb0ac17b [PATCH] e1000: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to e1000.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:31 -04:00
John W. Linville
2160de53cc [PATCH] b44: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to b44.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:31 -04:00
John W. Linville
62a720b889 [PATCH] 8139too: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to 8139too.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:31 -04:00
John W. Linville
bb0ce608a3 [PATCH] 8139cp: support ETHTOOL_GPERMADDR
Add support for ETHTOOL_GPERMADDR to 8139cp.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:29:31 -04:00
John W. Linville
c535a9dd26 [PATCH] ixgb: correct rx_dropped counting
Do not count frames dropped by the hardware as part of rx_dropped.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:26:16 -04:00
John W. Linville
ecf7130b08 [PATCH] e100: correct rx_dropped and add rx_missed_errors
Do not count non-error frames dropped by the hardware as
part of rx_dropped. Instead, count those frames dropped as
rx_missed_errors. Also, do not count other error frames as part of
rx_dropped. Finally, do not count oversized frames in rx_dropped
(since they are counted as part of rx_length_errors).

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:26:16 -04:00
John W. Linville
bd061bf1ff [PATCH] e1000: correct rx_dropped counting
Do not count frames dropped by the hardware as part of rx_dropped.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:26:16 -04:00
matthieu castet
1141455d5e [PATCH] airo : fix channel number in scan
this patch display the correct channel number with iwlist scan

Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:24:22 -04:00
Keith Owens
3be034b68a [PATCH] Correct xircom_cb use of CONFIG_NET_POLL_CONTROLLER
xircom_cb.c does #if CONFIG_NET_POLL_CONTROLLER instead of #ifdef,
resulting in drivers/net/tulip/xircom_cb.c:120:5: warning:
"CONFIG_NET_POLL_CONTROLLER" is not defined.

Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:04:02 -04:00
Andrew Morton
6b4d617d15 [PATCH] s2io warning fixes
drivers/net/s2io.c: In function `init_shared_mem':
drivers/net/s2io.c:431: warning: cast from pointer to integer of different size
drivers/net/s2io.c: In function `free_shared_mem':
drivers/net/s2io.c:662: warning: cast from pointer to integer of different size

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:03:34 -04:00
Stephen Hemminger
9734c3fc89 [PATCH] sk98lin: remove PCI id info for cards for conflicting devices
Fix PCI device id issues with sk98lin driver.
1. DLINK 530-T card has no Vital Product Data (VPD) area so the sk98lin
   driver won't work. (skge does however)
2. Remove commented out Yukon2 stuff
3. Restrict Linksys card to revisions that don't conflict with r8169 version.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-14 08:02:41 -04:00