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

Commit 8b2d1833 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (31 commits)
  Replace cpmac fix
  dl2k: the rest
  dl2k: MSCR, MSSR, ESR, PHY_SCR fixes
  dl2k: BMSR fixes
  dl2k: ANAR, ANLPAR fixes
  dl2k: BMCR_t fixes
  3c574, 3c515 bitfields abuse
  sbni endian fixes
  wan/lmc bitfields fixes
  dscc4 endian fixes
  S2io: Fixed synchronization between scheduling of napi with card reset and close
  atl1: fix frame length bug
  Documentation: add a guideline for hard_start_xmit method
  Revert "sky2: remove check for PCI wakeup setting from BIOS"
  e1000e Kconfig: remove ref to nonexistant docs
  bonding: Don't hold lock when calling rtnl_unlock
  bonding: fix lock ordering for rtnl and bonding_rwsem
  bonding: Fix up parameter parsing
  bonding: release slaves when master removed via sysfs
  bonding: fix locking during alb failover and slave removal
  ...
parents c9daa272 ba596a01

Documentation/networking/driver.txt

+4 −1
Original line number Diff line number Diff line
@@ -61,7 +61,10 @@ Transmit path guidelines: 
2) Do not forget to update netdev->trans_start to jiffies after

   each new tx packet is given to the hardware.



3) Do not forget that once you return 0 from your hard_start_xmit

3) A hard_start_xmit method must not modify the shared parts of a

   cloned SKB.



4) Do not forget that once you return 0 from your hard_start_xmit

   method, it is your driver's responsibility to free up the SKB

   and in some finite amount of time.

drivers/net/3c515.c

+31 −29
Original line number Diff line number Diff line
@@ -243,14 +243,16 @@ enum eeprom_offset { 
enum Window3 {			/* Window 3: MAC/config bits. */

	Wn3_Config = 0, Wn3_MAC_Ctrl = 6, Wn3_Options = 8,

};

union wn3_config {

	int i;

	struct w3_config_fields {

		unsigned int ram_size:3, ram_width:1, ram_speed:2, rom_size:2;

		int pad8:8;

		unsigned int ram_split:2, pad18:2, xcvr:3, pad21:1, autoselect:1;

		int pad24:7;

	} u;

enum wn3_config {

	Ram_size = 7,

	Ram_width = 8,

	Ram_speed = 0x30,

	Rom_size = 0xc0,

	Ram_split_shift = 16,

	Ram_split = 3 << Ram_split_shift,

	Xcvr_shift = 20,

	Xcvr = 7 << Xcvr_shift,

	Autoselect = 0x1000000,

};



enum Window4 {
@@ -614,7 +616,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, 
	/* Read the station address from the EEPROM. */

	EL3WINDOW(0);

	for (i = 0; i < 0x18; i++) {

		short *phys_addr = (short *) dev->dev_addr;

		__be16 *phys_addr = (__be16 *) dev->dev_addr;

		int timer;

		outw(EEPROM_Read + i, ioaddr + Wn0EepromCmd);

		/* Pause for at least 162 us. for the read to take place. */
@@ -646,22 +648,22 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, 


	{

		char *ram_split[] = { "5:3", "3:1", "1:1", "3:5" };

		union wn3_config config;

		__u32 config;

		EL3WINDOW(3);

		vp->available_media = inw(ioaddr + Wn3_Options);

		config.i = inl(ioaddr + Wn3_Config);

		config = inl(ioaddr + Wn3_Config);

		if (corkscrew_debug > 1)

			printk(KERN_INFO "  Internal config register is %4.4x, transceivers %#x.\n",

				config.i, inw(ioaddr + Wn3_Options));

				config, inw(ioaddr + Wn3_Options));

		printk(KERN_INFO "  %dK %s-wide RAM %s Rx:Tx split, %s%s interface.\n",

			8 << config.u.ram_size,

			config.u.ram_width ? "word" : "byte",

			ram_split[config.u.ram_split],

			config.u.autoselect ? "autoselect/" : "",

			media_tbl[config.u.xcvr].name);

		dev->if_port = config.u.xcvr;

		vp->default_media = config.u.xcvr;

		vp->autoselect = config.u.autoselect;

			8 << config & Ram_size,

			config & Ram_width ? "word" : "byte",

			ram_split[(config & Ram_split) >> Ram_split_shift],

			config & Autoselect ? "autoselect/" : "",

			media_tbl[(config & Xcvr) >> Xcvr_shift].name);

		vp->default_media = (config & Xcvr) >> Xcvr_shift;

		vp->autoselect = config & Autoselect ? 1 : 0;

		dev->if_port = vp->default_media;

	}

	if (vp->media_override != 7) {

		printk(KERN_INFO "  Media override to transceiver type %d (%s).\n",
@@ -694,14 +696,14 @@ static int corkscrew_open(struct net_device *dev) 
{

	int ioaddr = dev->base_addr;

	struct corkscrew_private *vp = netdev_priv(dev);

	union wn3_config config;

	__u32 config;

	int i;



	/* Before initializing select the active media port. */

	EL3WINDOW(3);

	if (vp->full_duplex)

		outb(0x20, ioaddr + Wn3_MAC_Ctrl);	/* Set the full-duplex bit. */

	config.i = inl(ioaddr + Wn3_Config);

	config = inl(ioaddr + Wn3_Config);



	if (vp->media_override != 7) {

		if (corkscrew_debug > 1)
@@ -727,12 +729,12 @@ static int corkscrew_open(struct net_device *dev) 
	} else

		dev->if_port = vp->default_media;



	config.u.xcvr = dev->if_port;

	outl(config.i, ioaddr + Wn3_Config);

	config = (config & ~Xcvr) | (dev->if_port << Xcvr_shift);

	outl(config, ioaddr + Wn3_Config);



	if (corkscrew_debug > 1) {

		printk("%s: corkscrew_open() InternalConfig %8.8x.\n",

		       dev->name, config.i);

		       dev->name, config);

	}



	outw(TxReset, ioaddr + EL3_CMD);
@@ -901,7 +903,7 @@ static void corkscrew_timer(unsigned long data) 
			ok = 1;

		}

		if (!ok) {

			union wn3_config config;

			__u32 config;



			do {

				dev->if_port =
@@ -928,9 +930,9 @@ static void corkscrew_timer(unsigned long data) 
			     ioaddr + Wn4_Media);



			EL3WINDOW(3);

			config.i = inl(ioaddr + Wn3_Config);

			config.u.xcvr = dev->if_port;

			outl(config.i, ioaddr + Wn3_Config);

			config = inl(ioaddr + Wn3_Config);

			config = (config & ~Xcvr) | (dev->if_port << Xcvr_shift);

			outl(config, ioaddr + Wn3_Config);



			outw(dev->if_port == 3 ? StartCoax : StopCoax,

			     ioaddr + EL3_CMD);

drivers/net/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -1976,9 +1976,6 @@ config E1000E 


	  <http://support.intel.com>



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/e1000e.txt>.



	  To compile this driver as a module, choose M here. The module

	  will be called e1000e.

drivers/net/atl1/atl1_main.c

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter) 
	struct atl1_hw *hw = &adapter->hw;

	struct net_device *netdev = adapter->netdev;



	hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;

	hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;

	hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;



	adapter->wol = 0;
@@ -688,7 +688,7 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu) 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);

	int old_mtu = netdev->mtu;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;



	if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||

	    (max_frame > MAX_JUMBO_FRAME_SIZE)) {
@@ -853,8 +853,8 @@ static u32 atl1_configure(struct atl1_adapter *adapter) 
	/* set Interrupt Clear Timer */

	iowrite16(adapter->ict, hw->hw_addr + REG_CMBDISDMA_TIMER);



	/* set MTU, 4 : VLAN */

	iowrite32(hw->max_frame_size + 4, hw->hw_addr + REG_MTU);

	/* set max frame size hw will accept */

	iowrite32(hw->max_frame_size, hw->hw_addr + REG_MTU);



	/* jumbo size & rrd retirement timer */

	value = (((u32) hw->rx_jumbo_th & RXQ_JMBOSZ_TH_MASK)

drivers/net/bonding/bond_alb.c

+14 −9
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct 
/*

 * Send learning packets after MAC address swap.

 *

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

 * Called with RTNL and no other locks

 */

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

				struct slave *slave2)
@@ -987,6 +987,8 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1, 
	int slaves_state_differ = (SLAVE_IS_OK(slave1) != SLAVE_IS_OK(slave2));

	struct slave *disabled_slave = NULL;



	ASSERT_RTNL();



	/* fasten the change in the switch */

	if (SLAVE_IS_OK(slave1)) {

		alb_send_learning_packets(slave1, slave1->dev->dev_addr);
@@ -1031,7 +1033,7 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1, 
 * a slave that has @slave's permanet address as its current address.

 * We'll make sure that that slave no longer uses @slave's permanent address.

 *

 * Caller must hold bond lock

 * Caller must hold RTNL and no other locks

 */

static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *slave)

{
@@ -1542,7 +1544,12 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave) 
	return 0;

}



/* Caller must hold bond lock for write */

/*

 * Remove slave from tlb and rlb hash tables, and fix up MAC addresses

 * if necessary.

 *

 * Caller must hold RTNL and no other locks

 */

void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave)

{

	if (bond->slave_cnt > 1) {
@@ -1601,9 +1608,6 @@ 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;

	}
@@ -1649,6 +1653,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
	write_unlock_bh(&bond->curr_slave_lock);

	read_unlock(&bond->lock);



	ASSERT_RTNL();



	/* curr_active_slave must be set before calling alb_swap_mac_addr */

	if (swap_slave) {

		/* swap mac address */
@@ -1659,12 +1665,11 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
				       bond->alb_info.rlb_enabled);

	}



	read_lock(&bond->lock);



	if (swap_slave) {

		alb_fasten_mac_swap(bond, swap_slave, new_slave);

		read_lock(&bond->lock);

	} else {

		/* fasten bond mac on new current slave */

		read_lock(&bond->lock);

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

	}