summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* Automatic merge of ↵Linus Torvalds2005-05-266-1/+12361
|\ | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
| * [BNX2]: New Broadcom gigabit network driver.Michael Chan2005-05-265-0/+12360
| | | | | | | | | | | | | | | | | | | | | | | | | | A new driver bnx2 for Broadcom bcm5706 is available. The patch also includes new 1000BASE-X advertisement bit definitions in mii.h Thanks to David Miller and Jeff Garzik for reviewing and their valuable feedback. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [BONDING]: bonding using arp_ip_target may stay down with active path Jay Vosburgh2005-05-261-1/+1
| | | | | | | | | | | | | | Correcting the list traversal makes the problem go away. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Automatic merge of /spare/repo/netdev-2.6 branch tlan2005-05-251-0/+12
|\ \
| * | [PATCH] fix PROMISC/bridging in TLAN driverJames Harper2005-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been a problem for me for ages. When using bridging, the driver is switched into promiscuous mode before the link init is complete. The init complete routine then resets the promisc bit on the card so the kernel still thinks the card is in promiscuous mode but the card isn't. doh. I think this bug only shows up in bridging when the bridge is started at boot time (or something else that sets promisc at the same time the card was started). If promisc is enabled later it works. Here's a trivial (and hopefully correct) patch that works for me. It just calls the promisc/multicast setup routine after init. Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [PATCH] tlan: restore deleted module parameters.Stephen Hemminger2005-05-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module parameter values got lost in the conversion to the new module_param interface. This should fix it. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Index: tlan/drivers/net/tlan.c ===================================================================
* | | Automatic merge of /spare/repo/netdev-2.6 branch sis9002005-05-252-3/+50
|\ \ \
| * | | [PATCH] SIS900 must select MIIAdrian Bunk2005-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following compile error caused by bk-netdev: <-- snip --> ... LD .tmp_vmlinux1 drivers/built-in.o(.text+0x98528): In function `sis900_get_settings': : undefined reference to `mii_ethtool_gset' drivers/built-in.o(.text+0x98538): In function `sis900_set_settings': : undefined reference to `mii_ethtool_sset' drivers/built-in.o(.text+0x98517): In function `sis900_get_link': : undefined reference to `mii_link_ok' drivers/built-in.o(.text+0x98547): In function `sis900_nway_reset': : undefined reference to `mii_nway_restart' make: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Daniele Venzano <venza@brownhat.org>
| * | | [PATCH] More ethtool support for sis900 and warning fixDaniele Venzano2005-05-121-3/+49
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to sis900 for the following ethtool ops: - get_link - get_settings - set_settings - nway_reset Signed-off-by: Daniele Venzano <webvenza@libero.it> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Automatic merge of /spare/repo/netdev-2.6 branch veth2005-05-251-9/+23
|\ \ \
| * | | [PATCH] iseries_veth: Cleanup skbs to prevent unregister_netdevice() hangingMichael Ellerman2005-05-151-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, The iseries_veth driver is badly behaved in that it will keep TX packets hanging around forever if they're not ACK'ed and the queue never fills up. This causes the unregister_netdevice code to wait forever when we try to take the device down, because there's still skbs around with references to our struct net_device. There's already code to cleanup any un-ACK'ed packets in veth_stop_connection() but it's being called after we unregister the net_device, which is too late. The fix is to rearrange the module exit function so that we cleanup any outstanding skbs and then unregister the driver. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| * | | [PATCH] iseries_veth: Don't leak skbs in RX pathMichael Ellerman2005-05-151-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, Under some strange circumstances the iseries_veth driver can leak skbs. Fix is simply to call dev_kfree_skb() in the right place. Fix up the comment as well. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| * | | [PATCH] iseries_veth: Set dev->trans_start so watchdog timer works rightMichael Ellerman2005-05-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, The iseries_veth driver doesn't set dev->trans_start in it's TX path. This will cause the net device watchdog timer to fire earlier than we want it to, which causes the driver to needlessly reset its connections to other LPARs. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| * | | [PATCH] iseries_veth: Don't send packets to LPARs which aren't upMichael Ellerman2005-05-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, The iseries_veth driver has a logic bug which means it will erroneously send packets to LPARs for which we don't have a connection. This usually isn't a big problem because the Hypervisor call fails gracefully and we return, but if packets are TX'ed during the negotiation of the connection bad things might happen. Regardless, the right thing is to bail early if we know there's no connection. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
* | | Automatic merge of /spare/repo/netdev-2.6 branch ns838202005-05-251-40/+29
|\ \ \
| * | | [PATCH] ns83820 updateBenjamin LaHaise2005-05-151-40/+29
| |/ / | | | | | | | | | | | | | | | | | | Changes: - improved DAC ifdefs from Andi Kleen - removal of dead code from Adrian Bunk - fix half duplex collision behaviour
* | | Automatic merge of /spare/repo/netdev-2.6 branch natsemi2005-05-251-3/+3
|\ \ \
| * | | [PATCH] Fw: [Bugme-new] [Bug 4482] New: natsemi: incorrect initialization of ↵Herbert Xu2005-05-151-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IPv6 Neighbor-discovery multicast On Wed, Apr 13, 2005 at 05:36:42PM +0000, Andrew Morton wrote: > Summary: natsemi: incorrect initialization of IPv6 Neighbor- > discovery multicast I've got a pair of FA312 cards and this problem has bothered me for ages. This has finally prompted me to do something about it :) Turns out that somebody wasn't following the documentation. We were doing 16-bit writes to 32-bit registers which led to some addresses working and others not so lucky. This patch should fix the problem. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
* | | Automatic merge of /spare/repo/netdev-2.6 branch forcedeth2005-05-251-17/+86
|\ \ \
| * | | [PATCH] forcedeth: Update error handlingManfred Spraul2005-05-151-17/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ayaz wrote an update to the error handling for forcedeth (which I modified heavily, thus all bugs are mine): The ERROR4 bit is not a fatal error, it just indicates a mismatch between the actual packet len and the len according to the 802.3 header. The patch adds proper handling. The patch also removes the code that drops all packets with RX_ERROR & (!RX_FRAMINGERR): ERROR4 errors are also not fatal.
| * | | [PATCH] forcedeth: netpoll supportMichal Schmidt2005-05-121-0/+10
| |/ /
* | | Automatic merge of /spare/repo/netdev-2.6 branch airo2005-05-251-46/+104
|\ \ \
| * | | [PATCH] wireless/airo: WEXT and quality correctionsDan Williams2005-05-151-46/+104
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch brings the airo driver into line with the current WEXT specification of signal quality. It also fixes the values used to determine signal quality and level for MPI & PCMCIA 350 cards. It turns out that BSSListRid.rssi was actually in dBm for 350 series cards, and that we can use the normalized signal strength reported by the card as our "quality" value, on a scale of 0 - 100. Since signal level values are in dBm for this driver, max_qual->level MUST be 0, as specified in the WEXT spec. This patch also uses the IW_QUAL constants new in WEXT version 17. Signed-off-by: Dan Williams <dcbw@redhat.com>
* | | Automatic merge of /spare/repo/netdev-2.6 branch atmel2005-05-251-0/+1
|\ \ \ | |_|/ |/| |
| * | [PATCH] atmel wirelesssimon@thekelleys.org.uk2005-05-151-0/+1
| |/ | | | | | | | | Below is a one-liner for the atmel wireless driver, just adding another card to the table.
* | Automatic merge of /spare/repo/netdev-2.6 branch amd81112005-05-251-10/+14
|\ \
| * | [PATCH] drivers/net/amd8111e.c: fix NAPI interrupt in pollLiu Tao2005-05-121-10/+14
| |/ | | | | | | | | | | | | | | | | This patch makes the netif_rx_complete() and rx_interrupt_enable atomic when exiting the poll() method, so to avoid interrupt in poll. It also fixes the rx interrupt check logic in interrupt handler. Signed-off-by: Liu Tao <liutao1980@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | Automatic merge of /spare/repo/netdev-2.6 branch pcnet322005-05-251-2/+5
|\ \
| * | [PATCH] pcnet32: fix resource leak with loopback testDon Fry2005-05-151-2/+5
| |/ | | | | | | | | | | | | | | When running the loopback test, resources are not properly released on completion. This patch frees all transmit resources after running the loopback test. Tested on ia32 and ppc64 hardware. Signed-off-by: Don Fry <brazilnut@us.ibm.com>
* | Automatic merge of /spare/repo/netdev-2.6 branch ixgb2005-05-255-116/+70
|\ \
| * | [PATCH] ixgb: Driver version, white space, comments, device idMalli Chilakala2005-05-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Driver version, white space, comments, device id & other Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
| * | [PATCH] ixgb: Fixed msec_delay in osdep to use msleepMalli Chilakala2005-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed msec_delay in osdep to use msleep 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_osdep.h net-drivers-2.6/drivers/net/ixgb.new/ixgb_osdep.h
| * | [PATCH] ixgb: Code optimizationMalli Chilakala2005-05-121-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code optimization 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
| * | [PATCH] ixgb: Remove hook for suspend, no power managementMalli Chilakala2005-05-121-71/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hook for suspend. No power management in 10GbE Controllers Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
| * | [PATCH] ixgb: Support for ethtool -dMalli Chilakala2005-05-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ixgb support for ethtool -d 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ethtool.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ethtool.c
| * | [PATCH] ixgb: Fix EEPROM functions to be endian-awareMalli Chilakala2005-05-121-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EEPROM functions to be endian-aware 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ee.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ee.c
| * | [PATCH] ixgb: Reset status in the RxMalli Chilakala2005-05-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset status in the Rx descriptor prior to handing it to the controller. Leave three Rx descriptors unused 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
| * | [PATCH] ixgb: Mask RXO interruptMalli Chilakala2005-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable RXO interrupt to decrease recovery time when system is overloaded with data 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
| * | [PATCH] ixgb: Change RDT write bump size to 4Malli Chilakala2005-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change RDT write bump size back to 4 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb.h net-drivers-2.6/drivers/net/ixgb.new/ixgb.h
| * | [PATCH] ixgb: Do not set the RS bit on context descriptorsMalli Chilakala2005-05-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set the RS bit on context descriptors, causes un-necessary bus activity 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
| * | [PATCH] ixgb: Fix multi-cast packet count in statisticsMalli Chilakala2005-05-121-4/+23
| |/ | | | | | | | | | | | | | | | | | | Fix multi-cast packet count in statistics 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> diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
* | Automatic merge of /spare/repo/netdev-2.6 branch e10002005-05-257-713/+3168
|\ \
| * | [PATCH] e1000:Driver version,white space,comments,device idMalli Chilakala2005-05-127-135/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | Driver version, white space, comments, device id & other Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c
| * | [PATCH] e1000:Adjust flow control watermarks for Jumbo FramesMalli Chilakala2005-05-121-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust flow control watermarks for Jumbo Frames 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> diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
| * | [PATCH] e1000:Fix Packet Buffer Allocation logic for 82547_rev_2Malli Chilakala2005-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Packet Buffer Allocation logic for 82547_rev_2 controller 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> diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
| * | [PATCH] e1000:82573 specific code & packet split codeMalli Chilakala2005-05-125-523/+2882
| | | | | | | | | | | | | | | | | | | | | | | | | | | 82573 specific code & packet split code 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> diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h
| * | [PATCH] e1000: Modified e1000_clean: exit pollMalli Chilakala2005-05-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified e1000_clean:: exit poll if no Tx and work_done == 0 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> diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
| * | [PATCH] e1000:Removed redundant statement in e1000_clean_tx_irqMalli Chilakala2005-05-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removed redundant statement in e1000_clean_tx_irq 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> diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
| * | [PATCH] e1000: Implement a workaround for 82546 errata 10Malli Chilakala2005-05-121-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Implement 82546 errata 10 -- first Tx descriptor cannot have more than 2015 byte of data in it or it could hang the transmitter. 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> diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
| * | [PATCH] e1000: e1000 stops working after resumeMalli Chilakala2005-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | e1000 stops working after resume, call pci_enable_device after pci_restore_state - Modified Andrew Morton's patch 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> diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
OpenPOWER on IntegriCloud