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

Commit 58717686 authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cff63a52 79f632c7

drivers/isdn/mISDN/socket.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr, 
	lock_sock(sk);

	lock_sock(sk);





	*addr_len = sizeof(*maddr);

	*addr_len = sizeof(*maddr);

	maddr->family = AF_ISDN;

	maddr->dev = _pms(sk)->dev->id;

	maddr->dev = _pms(sk)->dev->id;

	maddr->channel = _pms(sk)->ch.nr;

	maddr->channel = _pms(sk)->ch.nr;

	maddr->sapi = _pms(sk)->ch.addr & 0xff;

	maddr->sapi = _pms(sk)->ch.addr & 0xff;

drivers/isdn/sc/init.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -33,8 +33,8 @@ static unsigned long ram[] = {0, 0, 0, 0}; 
static bool do_reset = 0;

static bool do_reset = 0;





module_param_array(io, int, NULL, 0);

module_param_array(io, int, NULL, 0);

module_param_array(irq, int, NULL, 0);

module_param_array(irq, byte, NULL, 0);

module_param_array(ram, int, NULL, 0);

module_param_array(ram, long, NULL, 0);

module_param(do_reset, bool, 0);

module_param(do_reset, bool, 0);





static int identify_board(unsigned long, unsigned int);

static int identify_board(unsigned long, unsigned int);

drivers/net/bonding/bond_main.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1917,14 +1917,16 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	bond_detach_slave(bond, new_slave);

	bond_detach_slave(bond, new_slave);

	if (bond->primary_slave == new_slave)

	if (bond->primary_slave == new_slave)

		bond->primary_slave = NULL;

		bond->primary_slave = NULL;

	write_unlock_bh(&bond->lock);

	if (bond->curr_active_slave == new_slave) {

	if (bond->curr_active_slave == new_slave) {

		bond_change_active_slave(bond, NULL);

		write_unlock_bh(&bond->lock);

		read_lock(&bond->lock);

		read_lock(&bond->lock);

		write_lock_bh(&bond->curr_slave_lock);

		write_lock_bh(&bond->curr_slave_lock);

		bond_change_active_slave(bond, NULL);

		bond_select_active_slave(bond);

		bond_select_active_slave(bond);

		write_unlock_bh(&bond->curr_slave_lock);

		write_unlock_bh(&bond->curr_slave_lock);

		read_unlock(&bond->lock);

		read_unlock(&bond->lock);

	} else {

		write_unlock_bh(&bond->lock);

	}

	}

	slave_disable_netpoll(new_slave);

	slave_disable_netpoll(new_slave);

drivers/net/caif/caif_spi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -863,6 +863,7 @@ static int __init cfspi_init_module(void) 
	driver_remove_file(&cfspi_spi_driver.driver,

	driver_remove_file(&cfspi_spi_driver.driver,

			   &driver_attr_up_head_align);

			   &driver_attr_up_head_align);

 err_create_up_head_align:

 err_create_up_head_align:

	platform_driver_unregister(&cfspi_spi_driver);

 err_dev_register:

 err_dev_register:

	return result;

	return result;

}

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -1044,6 +1044,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie) 
	DP(NETIF_MSG_INTR,

	DP(NETIF_MSG_INTR,

	   "got an MSI-X interrupt on IDX:SB [fp %d fw_sd %d igusb %d]\n",

	   "got an MSI-X interrupt on IDX:SB [fp %d fw_sd %d igusb %d]\n",

	   fp->index, fp->fw_sb_id, fp->igu_sb_id);

	   fp->index, fp->fw_sb_id, fp->igu_sb_id);



	bnx2x_ack_sb(bp, fp->igu_sb_id, USTORM_ID, 0, IGU_INT_DISABLE, 0);

	bnx2x_ack_sb(bp, fp->igu_sb_id, USTORM_ID, 0, IGU_INT_DISABLE, 0);





#ifdef BNX2X_STOP_ON_ERROR

#ifdef BNX2X_STOP_ON_ERROR
@@ -1725,7 +1726,7 @@ static int bnx2x_req_irq(struct bnx2x *bp) 
	return request_irq(irq, bnx2x_interrupt, flags, bp->dev->name, bp->dev);

	return request_irq(irq, bnx2x_interrupt, flags, bp->dev->name, bp->dev);

}

}





static int bnx2x_setup_irqs(struct bnx2x *bp)

int bnx2x_setup_irqs(struct bnx2x *bp)

{

{

	int rc = 0;

	int rc = 0;

	if (bp->flags & USING_MSIX_FLAG &&

	if (bp->flags & USING_MSIX_FLAG &&
@@ -2581,6 +2582,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) 
		}

		}

	}

	}





	bnx2x_pre_irq_nic_init(bp);



	/* Connect to IRQs */

	/* Connect to IRQs */

	rc = bnx2x_setup_irqs(bp);

	rc = bnx2x_setup_irqs(bp);

	if (rc) {

	if (rc) {
@@ -2590,11 +2593,11 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) 
		LOAD_ERROR_EXIT(bp, load_error2);

		LOAD_ERROR_EXIT(bp, load_error2);

	}

	}





	/* Setup NIC internals and enable interrupts */

	bnx2x_nic_init(bp, load_code);



	/* Init per-function objects */

	/* Init per-function objects */

	if (IS_PF(bp)) {

	if (IS_PF(bp)) {

		/* Setup NIC internals and enable interrupts */

		bnx2x_post_irq_nic_init(bp, load_code);



		bnx2x_init_bp_objs(bp);

		bnx2x_init_bp_objs(bp);

		bnx2x_iov_nic_init(bp);

		bnx2x_iov_nic_init(bp);