Commit 80445de5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  e1000: fix virtualization bug
  bonding: fix alb mode locking regression
  Bluetooth: Fix issue with sysfs handling for connections
  usbnet: CDC EEM support (v5)
  tcp: Fix tcp_prequeue() to get correct rto_min value
  ehea: fix invalid pointer access
  ne2k-pci: Do not register device until initialized.
  Subject: [PATCH] br2684: restore net_dev initialization
  net: Only store high 16 bits of kernel generated filter priorities
  virtio_net: Fix function name typo
  virtio_net: Cleanup command queue scatterlist usage
  bonding: correct the cleanup in bond_create()
  virtio: add missing include to virtio_net.h
  smsc95xx: add support for LAN9512 and LAN9514
  smsc95xx: configure LED outputs
  netconsole: take care of NETDEV_UNREGISTER event
  xt_socket: checks for the state of nf_conntrack
  bonding: bond_slave_info_query() fix
  cxgb3: fixing gcc 4.4 compiler warning: suggest parentheses around operand of ‘!’
  netfilter: use likely() in xt_info_rdlock_bh()
  ...
parents 32bc66d8 bc83871e

drivers/net/bonding/bond_alb.c

+3 −9
Original line number Diff line number Diff line
@@ -1706,10 +1706,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
 * Called with RTNL

 */

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

	__releases(&bond->curr_slave_lock)

	__releases(&bond->lock)

	__acquires(&bond->lock)

	__acquires(&bond->curr_slave_lock)

	__releases(&bond->lock)

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct sockaddr *sa = addr;
@@ -1745,9 +1743,6 @@ 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);
@@ -1755,16 +1750,15 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) 
		alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr,

				       bond->alb_info.rlb_enabled);



		read_lock(&bond->lock);

		alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr);

		if (bond->alb_info.rlb_enabled) {

			/* inform clients mac address has changed */

			rlb_req_update_slave_clients(bond, bond->curr_active_slave);

		}

		read_unlock(&bond->lock);

	}



	read_lock(&bond->lock);

	write_lock_bh(&bond->curr_slave_lock);



	return 0;

}

drivers/net/bonding/bond_main.c

+13 −23
Original line number Diff line number Diff line
@@ -2213,33 +2213,24 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in 
{

	struct bonding *bond = netdev_priv(bond_dev);

	struct slave *slave;

	int i, found = 0;



	if (info->slave_id < 0) {

		return -ENODEV;

	}

	int i, res = -ENODEV;



	read_lock(&bond->lock);



	bond_for_each_slave(bond, slave, i) {

		if (i == (int)info->slave_id) {

			found = 1;

			break;

		}

	}



	read_unlock(&bond->lock);



	if (found) {

			res = 0;

			strcpy(info->slave_name, slave->dev->name);

			info->link = slave->link;

			info->state = slave->state;

			info->link_failure_count = slave->link_failure_count;

	} else {

		return -ENODEV;

			break;

		}

	}



	return 0;

	read_unlock(&bond->lock);



	return res;

}



/*-------------------------------- Monitoring -------------------------------*/
@@ -5167,16 +5158,15 @@ int bond_create(char *name, struct bond_params *params) 
	up_write(&bonding_rwsem);

	rtnl_unlock(); /* allows sysfs registration of net device */

	res = bond_create_sysfs_entry(netdev_priv(bond_dev));

	if (res < 0) {

		rtnl_lock();

		down_write(&bonding_rwsem);

		bond_deinit(bond_dev);

		unregister_netdevice(bond_dev);

		goto out_rtnl;

	}

	if (res < 0)

		goto out_unreg;



	return 0;



out_unreg:

	rtnl_lock();

	down_write(&bonding_rwsem);

	unregister_netdevice(bond_dev);

out_bond:

	bond_deinit(bond_dev);

out_netdev:

drivers/net/cxgb3/t3_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -3779,7 +3779,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, 


	adapter->params.info = ai;

	adapter->params.nports = ai->nports0 + ai->nports1;

	adapter->params.chan_map = !!ai->nports0 | (!!ai->nports1 << 1);

	adapter->params.chan_map = (!!ai->nports0) | (!!ai->nports1 << 1);

	adapter->params.rev = t3_read_reg(adapter, A_PL_REV);

	/*

	 * We used to only run the "adapter check task" once a second if

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3738,7 +3738,7 @@ static irqreturn_t e1000_intr(int irq, void *data) 
	struct e1000_hw *hw = &adapter->hw;

	u32 rctl, icr = er32(ICR);



	if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags)))

	if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags)))

		return IRQ_NONE;  /* Not our interrupt */



	/* IMS will not auto-mask if INT_ASSERTED is not set, and if it is

drivers/net/ehea/ehea.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0100"

#define DRV_VERSION	"EHEA_0101"



/* eHEA capability flags */

#define DLPAR_PORT_ADD_REM 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE