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

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

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

parents 2573d788 f892a84c

drivers/net/bonding/bond_main.c

+0 −2
Original line number Diff line number Diff line
@@ -979,7 +979,6 @@ static void bond_poll_controller(struct net_device *bond_dev) 
		if (bond_3ad_get_active_agg_info(bond, &ad_info))

			return;



	rcu_read_lock_bh();

	bond_for_each_slave_rcu(bond, slave, iter) {

		ops = slave->dev->netdev_ops;

		if (!bond_slave_is_up(slave) || !ops->ndo_poll_controller)
@@ -1000,7 +999,6 @@ static void bond_poll_controller(struct net_device *bond_dev) 
		ops->ndo_poll_controller(slave->dev);

		up(&ni->dev_lock);

	}

	rcu_read_unlock_bh();

}



static void bond_netpoll_cleanup(struct net_device *bond_dev)

drivers/net/ethernet/renesas/ravb_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1659,7 +1659,7 @@ static int ravb_probe(struct platform_device *pdev) 
	ndev->dma = -1;

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		error = -ENODEV;

		error = irq;

		goto out_release;

	}

	ndev->irq = irq;

drivers/net/ethernet/renesas/sh_eth.c

+1 −3
Original line number Diff line number Diff line
@@ -3089,10 +3089,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 


	ndev->dma = -1;

	ret = platform_get_irq(pdev, 0);

	if (ret < 0) {

		ret = -ENODEV;

	if (ret < 0)

		goto out_release;

	}

	ndev->irq = ret;



	SET_NETDEV_DEV(ndev, &pdev->dev);

drivers/net/ethernet/smsc/smsc911x.c

+4 −1
Original line number Diff line number Diff line
@@ -2428,7 +2428,10 @@ static int smsc911x_drv_probe(struct platform_device *pdev) 
	res_size = resource_size(res);



	irq = platform_get_irq(pdev, 0);

	if (irq <= 0) {

	if (irq == -EPROBE_DEFER) {

		retval = -EPROBE_DEFER;

		goto out_0;

	} else if (irq <= 0) {

		pr_warn("Could not allocate irq resource\n");

		retval = -ENODEV;

		goto out_0;

include/uapi/linux/netlink.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct nlmsgerr { 
#define NETLINK_TX_RING			7

#define NETLINK_LISTEN_ALL_NSID		8

#define NETLINK_LIST_MEMBERSHIPS	9

#define NETLINK_CAP_ACK			10



struct nl_pktinfo {

	__u32	group;