Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a0e554b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (39 commits)
  Remove Andrew Morton from list of net driver maintainers.
  bonding: Acquire correct locks in alb for promisc change
  bonding: Convert more locks to _bh, acquire rtnl, for new locking
  bonding: Convert locks to _bh, rework alb locking for new locking
  bonding: Convert miimon to new locking
  bonding: Convert balance-rr transmit to new locking
  Convert bonding timers to workqueues
  Update MAINTAINERS to reflect my (jgarzik's) current efforts.
  pasemi_mac: fix typo
  defxx.c: dfx_bus_init() is __devexit not __devinit
  s390 MAINTAINERS
  remove header_ops bug in qeth driver
  sky2: crash on remove
  MIPSnet: Delete all the useless debugging printks.
  AR7 ethernet: small post-merge cleanups and fixes
  mv643xx_eth: Hook up mv643xx_get_sset_count
  mv643xx_eth: Remove obsolete checksum offload comment
  mv643xx_eth: Merge drivers/net/mv643xx_eth.h into mv643xx_eth.c
  mv643xx_eth: Remove unused register defines
  mv643xx_eth: Clean up mv643xx_eth.h
  ...
parents c09b360a 2c800093

MAINTAINERS

+2 −29
Original line number Diff line number Diff line
@@ -136,17 +136,6 @@ M: ajk@iehk.rwth-aachen.de 
L:	linux-hams@vger.kernel.org

S:	Maintained



8139CP 10/100 FAST ETHERNET DRIVER

P:	Jeff Garzik

M:	jgarzik@pobox.com

S:	Maintained



8139TOO 10/100 FAST ETHERNET DRIVER

P:	Jeff Garzik

M:	jgarzik@pobox.com

W:	http://sourceforge.net/projects/gkernel/

S:	Maintained



8169 10/100/1000 GIGABIT ETHERNET DRIVER

P:	Francois Romieu

M:	romieu@fr.zoreil.com
@@ -1043,12 +1032,6 @@ M: kernel@wantstofly.org 
L:	netdev@vger.kernel.org

S:	Maintained



CIRRUS LOGIC GENERIC FBDEV DRIVER

P:	Jeff Garzik

M:	jgarzik@pobox.com

L:	linux-fbdev-devel@lists.sourceforge.net (subscribers-only)

S:	Odd Fixes



CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER

P:	Lennert Buytenhek

M:	kernel@wantstofly.org
@@ -1969,12 +1952,6 @@ M: adaplas@gmail.com 
L:	linux-fbdev-devel@lists.sourceforge.net (subscribers-only)

S:	Maintained



INTEL I8XX RANDOM NUMBER GENERATOR SUPPORT

P:	Jeff Garzik

M:	jgarzik@pobox.com

W:	http://sourceforge.net/projects/gkernel/

S:	Maintained



INTEL IA32 MICROCODE UPDATE SUPPORT

P:	Tigran Aivazian

M:	tigran@aivazian.fsnet.co.uk
@@ -2701,8 +2678,6 @@ M: Paul.Clements@steeleye.com 
S:	Maintained



NETWORK DEVICE DRIVERS

P:	Andrew Morton

M:	akpm@linux-foundation.org

P:	Jeff Garzik

M:	jgarzik@pobox.com

L:	netdev@vger.kernel.org
@@ -3254,6 +3229,8 @@ S: Supported 
S390 NETWORK DRIVERS

P:	Ursula Braun

M:	ubraun@linux.vnet.ibm.com

P:	Frank Blaschka

M:	blaschka@linux.vnet.ibm.com

M:	linux390@de.ibm.com

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/
@@ -4109,10 +4086,6 @@ M: hirofumi@mail.parknet.co.jp 
L:	linux-kernel@vger.kernel.org

S:	Maintained



VIA 82Cxxx AUDIO DRIVER (old OSS driver)

P:	Jeff Garzik

S:	Odd fixes



VIA RHINE NETWORK DRIVER

P:	Roger Luethi

M:	rl@hellgate.ch

drivers/net/Kconfig

+8 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -128,12 +128,12 @@ static inline u8 _simple_hash(const u8 *hash_start, int hash_size) 


static inline void _lock_tx_hashtbl(struct bonding *bond)

{

	spin_lock(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));

	spin_lock_bh(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));

}



static inline void _unlock_tx_hashtbl(struct bonding *bond)

{

	spin_unlock(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));

	spin_unlock_bh(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));

}



/* Caller must hold tx_hashtbl lock */
@@ -305,12 +305,12 @@ static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u3 
/*********************** rlb specific functions ***************************/

static inline void _lock_rx_hashtbl(struct bonding *bond)

{

	spin_lock(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));

	spin_lock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));

}



static inline void _unlock_rx_hashtbl(struct bonding *bond)

{

	spin_unlock(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));

	spin_unlock_bh(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));

}



/* when an ARP REPLY is received from a client update its info
@@ -472,13 +472,13 @@ static void rlb_clear_slave(struct bonding *bond, struct slave *slave) 


	_unlock_rx_hashtbl(bond);



	write_lock(&bond->curr_slave_lock);

	write_lock_bh(&bond->curr_slave_lock);



	if (slave != bond->curr_active_slave) {

		rlb_teach_disabled_mac_on_primary(bond, slave->dev->dev_addr);

	}



	write_unlock(&bond->curr_slave_lock);

	write_unlock_bh(&bond->curr_slave_lock);

}



static void rlb_update_client(struct rlb_client_info *client_info)
@@ -959,19 +959,34 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw) 
	return 0;

}



/* Caller must hold bond lock for write or curr_slave_lock for write*/

/*

 * Swap MAC addresses between two slaves.

 *

 * Called with RTNL held, and no other locks.

 *

 */



static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct slave *slave2)

{

	struct slave *disabled_slave = NULL;

	u8 tmp_mac_addr[ETH_ALEN];

	int slaves_state_differ;



	slaves_state_differ = (SLAVE_IS_OK(slave1) != SLAVE_IS_OK(slave2));



	memcpy(tmp_mac_addr, slave1->dev->dev_addr, ETH_ALEN);

	alb_set_slave_mac_addr(slave1, slave2->dev->dev_addr, bond->alb_info.rlb_enabled);

	alb_set_slave_mac_addr(slave2, tmp_mac_addr, bond->alb_info.rlb_enabled);



}



/*

 * Send learning packets after MAC address swap.

 *

 * Called with RTNL and bond->lock held for read.

 */

static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,

				struct slave *slave2)

{

	int slaves_state_differ = (SLAVE_IS_OK(slave1) != SLAVE_IS_OK(slave2));

	struct slave *disabled_slave = NULL;



	/* fasten the change in the switch */

	if (SLAVE_IS_OK(slave1)) {

		alb_send_learning_packets(slave1, slave1->dev->dev_addr);
@@ -1044,7 +1059,9 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla 
		}



		if (found) {

			/* locking: needs RTNL and nothing else */

			alb_swap_mac_addr(bond, slave, tmp_slave);

			alb_fasten_mac_swap(bond, slave, tmp_slave);

		}

	}

}
@@ -1375,8 +1392,10 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
	return 0;

}



void bond_alb_monitor(struct bonding *bond)

void bond_alb_monitor(struct work_struct *work)

{

	struct bonding *bond = container_of(work, struct bonding,

					    alb_work.work);

	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));

	struct slave *slave;

	int i;
@@ -1436,16 +1455,16 @@ void bond_alb_monitor(struct bonding *bond) 


	/* handle rlb stuff */

	if (bond_info->rlb_enabled) {

		/* the following code changes the promiscuity of the

		 * the curr_active_slave. It needs to be locked with a

		 * write lock to protect from other code that also

		 * sets the promiscuity.

		 */

		write_lock_bh(&bond->curr_slave_lock);



		if (bond_info->primary_is_promisc &&

		    (++bond_info->rlb_promisc_timeout_counter >= RLB_PROMISC_TIMEOUT)) {



			/*

			 * dev_set_promiscuity requires rtnl and

			 * nothing else.

			 */

			read_unlock(&bond->lock);

			rtnl_lock();



			bond_info->rlb_promisc_timeout_counter = 0;



			/* If the primary was set to promiscuous mode
@@ -1454,9 +1473,10 @@ void bond_alb_monitor(struct bonding *bond) 
			 */

			dev_set_promiscuity(bond->curr_active_slave->dev, -1);

			bond_info->primary_is_promisc = 0;

		}



		write_unlock_bh(&bond->curr_slave_lock);

			rtnl_unlock();

			read_lock(&bond->lock);

		}



		if (bond_info->rlb_rebalance) {

			bond_info->rlb_rebalance = 0;
@@ -1479,7 +1499,7 @@ void bond_alb_monitor(struct bonding *bond) 
	}



re_arm:

	mod_timer(&(bond_info->alb_timer), jiffies + alb_delta_in_ticks);

	queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks);

out:

	read_unlock(&bond->lock);

}
@@ -1500,11 +1520,11 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave) 
	/* caller must hold the bond lock for write since the mac addresses

	 * are compared and may be swapped.

	 */

	write_lock_bh(&bond->lock);

	read_lock(&bond->lock);



	res = alb_handle_addr_collision_on_attach(bond, slave);



	write_unlock_bh(&bond->lock);

	read_unlock(&bond->lock);



	if (res) {

		return res;
@@ -1569,13 +1589,21 @@ void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char 
 * Set the bond->curr_active_slave to @new_slave and handle

 * mac address swapping and promiscuity changes as needed.

 *

 * Caller must hold bond curr_slave_lock for write (or bond lock for write)

 * If new_slave is NULL, caller must hold curr_slave_lock or

 * bond->lock for write.

 *

 * If new_slave is not NULL, caller must hold RTNL, bond->lock for

 * read and curr_slave_lock for write.  Processing here may sleep, so

 * no other locks may be held.

 */

void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave)

{

	struct slave *swap_slave;

	int i;



	if (new_slave)

		ASSERT_RTNL();



	if (bond->curr_active_slave == new_slave) {

		return;

	}
@@ -1608,6 +1636,19 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
		}

	}



	/*

	 * Arrange for swap_slave and new_slave to temporarily be

	 * ignored so we can mess with their MAC addresses without

	 * fear of interference from transmit activity.

	 */

	if (swap_slave) {

		tlb_clear_slave(bond, swap_slave, 1);

	}

	tlb_clear_slave(bond, new_slave, 1);



	write_unlock_bh(&bond->curr_slave_lock);

	read_unlock(&bond->lock);



	/* curr_active_slave must be set before calling alb_swap_mac_addr */

	if (swap_slave) {

		/* swap mac address */
@@ -1616,11 +1657,23 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
		/* set the new_slave to the bond mac address */

		alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr,

				       bond->alb_info.rlb_enabled);

	}



	read_lock(&bond->lock);



	if (swap_slave) {

		alb_fasten_mac_swap(bond, swap_slave, new_slave);

	} else {

		/* fasten bond mac on new current slave */

		alb_send_learning_packets(new_slave, bond->dev->dev_addr);

	}



	write_lock_bh(&bond->curr_slave_lock);

}



/*

 * Called with RTNL

 */

int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)

{

	struct bonding *bond = bond_dev->priv;
@@ -1657,8 +1710,12 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) 
		}

	}



	write_unlock_bh(&bond->curr_slave_lock);

	read_unlock(&bond->lock);



	if (swap_slave) {

		alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave);

		alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave);

	} else {

		alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr,

				       bond->alb_info.rlb_enabled);
@@ -1670,6 +1727,9 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) 
		}

	}



	read_lock(&bond->lock);

	write_lock_bh(&bond->curr_slave_lock);



	return 0;

}