net driver updates
Subsystems (4)
PATCH 1/1 net driver updates
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus
to receive the following updates:
MAINTAINERS | 31 +-- drivers/net/Kconfig | 13 +- drivers/net/bonding/bond_3ad.c | 6 +- drivers/net/bonding/bond_3ad.h | 2 +- drivers/net/bonding/bond_alb.c | 110 ++++-- drivers/net/bonding/bond_alb.h | 2 +- drivers/net/bonding/bond_main.c | 330 ++++++++++------ drivers/net/bonding/bond_sysfs.c | 79 ++--- drivers/net/bonding/bonding.h | 14 +- drivers/net/cpmac.c | 31 +- drivers/net/defxx.c | 2 +- drivers/net/mipsnet.c | 44 +-- drivers/net/mv643xx_eth.c | 807 +++++++++++++++++++++++++++++++------- drivers/net/mv643xx_eth.h | 370 ----------------- drivers/net/pasemi_mac.c | 2 +- drivers/net/r8169.c | 406 +++++++++++++------- drivers/net/sky2.c | 4 +- include/linux/mv643xx.h | 328 +--------------- include/linux/mv643xx_eth.h | 31 ++ include/linux/netdevice.h | 2 +- 20 files changed, 1330 insertions(+), 1284 deletions(-) delete mode 100644 drivers/net/mv643xx_eth.h create mode 100644 include/linux/mv643xx_eth.h
Dale Farnsworth (2):
mv643xx_eth: Remove obsolete checksum offload comment
mv643xx_eth: Hook up mv643xx_get_sset_count
Francois Romieu (11):
r8169: convert bitfield to plain enum mask
r8169: MSI support
r8169: remove private net_device_stats structure
r8169: use the existing symbolic name of vendor PCI ID 0x1259
r8169: add MAC identifiers
r8169: remove dead wood
r8169: make room for more phy init changes
r8169: phy init for the 8168
r8169: phy init cleanup
r8169: update the phy init for the 8168C
r8169: more phy init for the 8168
Jay Vosburgh (6):
Convert bonding timers to workqueues
bonding: Convert balance-rr transmit to new locking
bonding: Convert miimon to new locking
bonding: Convert locks to _bh, rework alb locking for new locking
bonding: Convert more locks to _bh, acquire rtnl, for new locking
bonding: Acquire correct locks in alb for promisc change
Jeff Garzik (2):
Update MAINTAINERS to reflect my (jgarzik's) current efforts. Remove Andrew Morton from list of net driver maintainers.
Joe Perches (2):
r8169: add KERN_DEBUG to dprintk (trivial)
r8169: KERN_XXX vs PFX (trivial)
Lennert Buytenhek (9):
mv643xx_eth: Split off mv643xx_eth platform device data
mv643xx_eth: Move ethernet register definitions into private header
mv643xx_eth: Disable RX/TX byte swapping on little-endian systems
mv643xx_eth: Enable use on Orion platforms
mv643xx_eth: Remove SHARED_REGS register address bias
mv643xx_eth: Remove MV643XX_ETH_ register prefix
mv643xx_eth: Clean up mv643xx_eth.h
mv643xx_eth: Remove unused register defines
mv643xx_eth: Merge drivers/net/mv643xx_eth.h into mv643xx_eth.c
Maciej W. Rozycki (1):
defxx.c: dfx_bus_init() is __devexit not __devinit
Matteo Croce (1):
AR7 ethernet: small post-merge cleanups and fixes
Olof Johansson (1):
pasemi_mac: fix typo
Ralf Baechle (1):
MIPSnet: Delete all the useless debugging printks.
Stephen Hemminger (1):
sky2: crash on remove
Ursula Braun (2):
remove header_ops bug in qeth driver
s390 MAINTAINERS
MAINTAINERS +2 -29
@@ -136,17 +136,6 @@ M: [email protected] L: [email protected] S: Maintained -8139CP 10/100 FAST ETHERNET DRIVER -P: Jeff Garzik -M: [email protected] -S: Maintained - -8139TOO 10/100 FAST ETHERNET DRIVER -P: Jeff Garzik -M: [email protected] -W: http://sourceforge.net/projects/gkernel/ -S: Maintained - 8169 10/100/1000 GIGABIT ETHERNET DRIVER P: Francois Romieu M: [email protected]
@@ -1037,12 +1026,6 @@ M: [email protected] L: [email protected] S: Maintained -CIRRUS LOGIC GENERIC FBDEV DRIVER -P: Jeff Garzik -M: [email protected] -L: [email protected] (subscribers-only) -S: Odd Fixes - CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER P: Lennert Buytenhek M: [email protected]
@@ -1963,12 +1946,6 @@ M: [email protected] L: [email protected] (subscribers-only) S: Maintained -INTEL I8XX RANDOM NUMBER GENERATOR SUPPORT -P: Jeff Garzik -M: [email protected] -W: http://sourceforge.net/projects/gkernel/ -S: Maintained - INTEL IA32 MICROCODE UPDATE SUPPORT P: Tigran Aivazian M: [email protected]
@@ -2695,8 +2672,6 @@ M: [email protected] S: Maintained NETWORK DEVICE DRIVERS -P: Andrew Morton -M: [email protected] P: Jeff Garzik M: [email protected] L: [email protected]
@@ -3248,6 +3223,8 @@ S: Supported S390 NETWORK DRIVERS P: Ursula Braun M: [email protected] +P: Frank Blaschka +M: [email protected] M: [email protected] L: [email protected] W: http://www.ibm.com/developerworks/linux/linux390/
@@ -4103,10 +4080,6 @@ M: [email protected] L: [email protected] S: Maintained -VIA 82Cxxx AUDIO DRIVER (old OSS driver) -P: Jeff Garzik -S: Odd fixes - VIA RHINE NETWORK DRIVER P: Roger Luethi M: [email protected]
drivers/net/Kconfig +8 -5
@@ -2371,13 +2371,16 @@ config UGETH_TX_ON_DEMAND depends on UCC_GETH config MV643XX_ETH - tristate "MV-643XX Ethernet support" - depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) + tristate "Marvell Discovery (643XX) and Orion ethernet support" + depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || ARCH_ORION select MII help - This driver supports the gigabit Ethernet on the Marvell MV643XX - chipset which is used in the Momenco Ocelot C and Jaguar ATX and - Pegasos II, amongst other PPC and MIPS boards. + This driver supports the gigabit ethernet MACs in the + Marvell Discovery PPC/MIPS chipset family (MV643XX) and + in the Marvell Orion ARM SoC family. + + Some boards that use the Discovery chipset are the Momenco + Ocelot C and Jaguar ATX and Pegasos II. config QLA3XXX tristate "QLogic QLA3XXX Network Driver Support"
drivers/net/bonding/bond_3ad.c +4 -2
@@ -2076,8 +2076,10 @@ void bond_3ad_unbind_slave(struct slave *slave)* times out, and it selects an aggregator for the ports that are yet not * related to any aggregator, and selects the active aggregator for a bond. */ -void bond_3ad_state_machine_handler (struct bonding *bond) +void bond_3ad_state_machine_handler (struct work_struct *work) { + struct bonding *bond = container_of(work, struct bonding, + ad_work.work);struct port *port;struct aggregator *aggregator;
@@ -2128,7 +2130,7 @@ void bond_3ad_state_machine_handler(struct bonding *bond) } re_arm: -mod_timer (&(BOND_AD_INFO (bond).ad_timer), jiffies + ad_delta_in_ticks); +queue_delayed_work (bond->wq, &bond->ad_work, ad_delta_in_ticks); out:read_unlock (&bond->lock); }
drivers/net/bonding/bond_3ad.h +1 -1
@@ -276,7 +276,7 @@ struct ad_slave_info {void bond_3ad_initialize (struct bonding *bond,u16 tick_resolution,int lacp_fast);int bond_3ad_bind_slave (struct slave *slave);void bond_3ad_unbind_slave (struct slave *slave); -void bond_3ad_state_machine_handler (struct bonding *bond); +void bond_3ad_state_machine_handler (struct work_struct *);void bond_3ad_adapter_speed_changed (struct slave *slave);void bond_3ad_adapter_duplex_changed (struct slave *slave);void bond_3ad_handle_link_change (struct slave *slave,char link);
drivers/net/bonding/bond_alb.c +85 -25
243 lines not on this page · raw message
drivers/net/bonding/bond_alb.h +1 -1
@@ -125,7 +125,7 @@ void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave);void bond_alb_handle_link_change (struct bonding *bond,struct slave *slave,char link);void bond_alb_handle_active_change (struct bonding *bond,struct slave *new_slave);int bond_alb_xmit (struct sk_buff *skb,struct net_device *bond_dev); -void bond_alb_monitor (struct bonding *bond); +void bond_alb_monitor (struct work_struct *);int bond_alb_set_mac_address (struct net_device *bond_dev,void *addr);void bond_alb_clear_vlan (struct bonding *bond,unsigned short vlan_id);#endif /* __BOND_ALB_H__ */
drivers/net/bonding/bond_main.c +201 -129
708 lines not on this page · raw message
drivers/net/bonding/bond_sysfs.c +31 -48
148 lines not on this page · raw message
drivers/net/bonding/bonding.h +9 -5
@@ -184,8 +184,6 @@ struct bonding {s32 slave_cnt;/* never change this value outside the attach/detach wrappers */ rwlock_t lock;rwlock_t curr_slave_lock; -struct timer_list mii_timer; -struct timer_list arp_timer;s8 kill_timers;s8 send_grat_arp;s8 setup_by_slave;
@@ -199,12 +197,18 @@ struct bonding {int (*xmit_hash_policy)(struct sk_buff *,struct net_device *,int );__be32 master_ip;u16 flags; +u16 rr_tx_counter;struct ad_bond_info ad_info;struct alb_bond_info alb_info;struct bond_params params;struct list_head vlan_list;struct vlan_group *vlgrp;struct packet_type arp_mon_pt; +struct workqueue_struct *wq; +struct delayed_work mii_work; +struct delayed_work arp_work; +struct delayed_work alb_work; +struct delayed_work ad_work; };/**
@@ -307,9 +311,9 @@ int bond_create_slave_symlinks(struct net_device *master, struct net_device *slavoid bond_destroy_slave_symlinks (struct net_device *master,struct net_device *slave);int bond_enslave (struct net_device *bond_dev,struct net_device *slave_dev);int bond_release (struct net_device *bond_dev,struct net_device *slave_dev); -void bond_mii_monitor (struct net_device *bond_dev); -void bond_loadbalance_arp_mon (struct net_device *bond_dev); -void bond_activebackup_arp_mon (struct net_device *bond_dev); +void bond_mii_monitor (struct work_struct *); +void bond_loadbalance_arp_mon (struct work_struct *); +void bond_activebackup_arp_mon (struct work_struct *);void bond_set_mode_ops (struct bonding *bond,int mode);int bond_parse_parm (char *mode_arg,struct bond_parm_tbl *tbl);void bond_select_active_slave (struct bonding *bond);
drivers/net/cpmac.c +12 -19
@@ -460,18 +460,11 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)struct cpmac_desc *desc;struct cpmac_priv *priv =netdev_priv (dev); -if (unlikely (skb_padto (skb,ETH_ZLEN ))) { -if (netif_msg_tx_err (priv) &&net_ratelimit ()) -printk (KERN_WARNING -"%s: tx: padding failed, dropping\n" , dev->name); -spin_lock (&priv->lock); - dev->stats.tx_dropped++; -spin_unlock (&priv->lock); -return -ENOMEM ; - } +if (unlikely (skb_padto (skb,ETH_ZLEN ))) +return NETDEV_TX_OK ; len =max (skb->len,ETH_ZLEN ); - queue =skb_get_queue_mapping (skb); + queue = skb->queue_mapping;#ifdef CONFIG_NETDEVICES_MULTIQUEUE netif_stop_subqueue (dev, queue);#else
@@ -481,13 +474,9 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) desc = &priv->desc_ring[queue];if (unlikely (desc->dataflags &CPMAC_OWN )) {if (netif_msg_tx_err (priv) &&net_ratelimit ()) -printk (KERN_WARNING "%s: tx dma ring full, dropping\n" , +printk (KERN_WARNING "%s: tx dma ring full\n" , dev->name); -spin_lock (&priv->lock); - dev->stats.tx_dropped++; -spin_unlock (&priv->lock); -dev_kfree_skb_any (skb); -return -ENOMEM ; +return NETDEV_TX_BUSY ; }spin_lock (&priv->lock);
@@ -509,7 +498,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)cpmac_dump_skb (dev, skb);cpmac_write (priv->regs,CPMAC_TX_PTR (queue), (u32 )desc->mapping); -return 0 ; +return NETDEV_TX_OK ; }static void cpmac_end_xmit (struct net_device *dev,int queue)
@@ -646,12 +635,14 @@ static void cpmac_clear_tx(struct net_device *dev)int i;if (unlikely (!priv->desc_ring))return ; -for (i =0 ; i <CPMAC_QUEUES ; i++) +for (i =0 ; i <CPMAC_QUEUES ; i++) { + priv->desc_ring[i].dataflags =0 ;if (priv->desc_ring[i].skb) {dev_kfree_skb_any (priv->desc_ring[i].skb);if (netif_subqueue_stopped (dev, i))netif_wake_subqueue (dev, i); } + } }static void cpmac_hw_error (struct work_struct *work)
@@ -727,11 +718,13 @@ static void cpmac_tx_timeout(struct net_device *dev)#ifdef CONFIG_NETDEVICES_MULTIQUEUE for (i =0 ; i <CPMAC_QUEUES ; i++)if (priv->desc_ring[i].skb) { + priv->desc_ring[i].dataflags =0 ;dev_kfree_skb_any (priv->desc_ring[i].skb);netif_wake_subqueue (dev, i);break ; }#else + priv->desc_ring[0 ].dataflags =0 ;if (priv->desc_ring[0 ].skb)dev_kfree_skb_any (priv->desc_ring[0 ].skb);netif_wake_queue (dev);
@@ -794,7 +787,7 @@ static int cpmac_set_ringparam(struct net_device *dev, struct ethtool_ringparam* {struct cpmac_priv *priv =netdev_priv (dev); -if (dev->flags &&IFF_UP ) +if (netif_running (dev))return -EBUSY ; priv->ring_size = ring->rx_pending;return 0 ;
drivers/net/defxx.c +1 -1
@@ -805,7 +805,7 @@ static void __devinit dfx_bus_init(struct net_device *dev)* Interrupts are disabled at the adapter bus-specific logic. */ -static void __devinit dfx_bus_uninit (struct net_device *dev) +static void __devexit dfx_bus_uninit(struct net_device *dev) {DFX_board_t *bp =netdev_priv (dev);struct device *bdev = bp->bus_dev;
drivers/net/mipsnet.c +4 -40
133 lines not on this page · raw message
drivers/net/mv643xx_eth.c +670 -137
1,158 lines not on this page · raw message
drivers/net/mv643xx_eth.h deleted +0 -370
361 lines not on this page · raw message
drivers/net/r8169.c +265 -141
406 lines not on this page · raw message
include/linux/mv643xx.h +1 -327
328 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.