Commit 00a24705 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: (56 commits)
  route: Take the right src and dst addresses in ip_route_newports
  ipv4: Fix nexthop caching wrt. scoping.
  ipv4: Invalidate nexthop cache nh_saddr more correctly.
  net: fix pch_gbe section mismatch warning
  ipv4: fix fib metrics
  mlx4_en: Removing HW info from ethtool -i report.
  net_sched: fix THROTTLED/RUNNING race
  drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region
  drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region
  bonding: fix rx_handler locking
  myri10ge: fix rmmod crash
  mlx4_en: updated driver version to 1.5.4.1
  mlx4_en: Using blue flame support
  mlx4_core: reserve UARs for userspace consumers
  mlx4_core: maintain available field in bitmap allocator
  mlx4: Add blue flame support for kernel consumers
  mlx4_en: Enabling new steering
  mlx4: Add support for promiscuous mode in the new steering model.
  mlx4: generalization of multicast steering.
  mlx4_en: Reporting HW revision in ethtool -i
  ...
parents 5aafdea4 6df59a84

drivers/infiniband/hw/mlx4/main.c

+5 −6
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 


	err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,

				    !!(mqp->flags & MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),

				    MLX4_PROTOCOL_IB);

				    MLX4_PROT_IB_IPV6);

	if (err)

		return err;
@@ -636,7 +636,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	return 0;



err_add:

	mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);

	mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw, MLX4_PROT_IB_IPV6);

	return err;

}
@@ -666,7 +666,7 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	struct mlx4_ib_gid_entry *ge;



	err = mlx4_multicast_detach(mdev->dev,

				    &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);

				    &mqp->mqp, gid->raw, MLX4_PROT_IB_IPV6);

	if (err)

		return err;
@@ -721,7 +721,6 @@ static int init_node_data(struct mlx4_ib_dev *dev) 
	if (err)

		goto out;



	dev->dev->rev_id = be32_to_cpup((__be32 *) (out_mad->data + 32));

	memcpy(&dev->ib_dev.node_guid, out_mad->data + 12, 8);



out:
@@ -954,7 +953,7 @@ static int mlx4_ib_netdev_event(struct notifier_block *this, unsigned long event 
	mlx4_foreach_ib_transport_port(port, ibdev->dev) {

		oldnd = iboe->netdevs[port - 1];

		iboe->netdevs[port - 1] =

			mlx4_get_protocol_dev(ibdev->dev, MLX4_PROTOCOL_EN, port);

			mlx4_get_protocol_dev(ibdev->dev, MLX4_PROT_ETH, port);

		if (oldnd != iboe->netdevs[port - 1]) {

			if (iboe->netdevs[port - 1])

				netdev_added(ibdev, port);
@@ -1207,7 +1206,7 @@ static struct mlx4_interface mlx4_ib_interface = { 
	.add		= mlx4_ib_add,

	.remove		= mlx4_ib_remove,

	.event		= mlx4_ib_event,

	.protocol	= MLX4_PROTOCOL_IB

	.protocol	= MLX4_PROT_IB_IPV6

};



static int __init mlx4_ib_init(void)

drivers/net/a2065.c

+5 −5
Original line number Diff line number Diff line
@@ -711,14 +711,14 @@ static int __devinit a2065_init_one(struct zorro_dev *z, 
		return -EBUSY;

	r2 = request_mem_region(mem_start, A2065_RAM_SIZE, "RAM");

	if (!r2) {

		release_resource(r1);

		release_mem_region(base_addr, sizeof(struct lance_regs));

		return -EBUSY;

	}



	dev = alloc_etherdev(sizeof(struct lance_private));

	if (dev == NULL) {

		release_resource(r1);

		release_resource(r2);

		release_mem_region(base_addr, sizeof(struct lance_regs));

		release_mem_region(mem_start, A2065_RAM_SIZE);

		return -ENOMEM;

	}
@@ -764,8 +764,8 @@ static int __devinit a2065_init_one(struct zorro_dev *z, 


	err = register_netdev(dev);

	if (err) {

		release_resource(r1);

		release_resource(r2);

		release_mem_region(base_addr, sizeof(struct lance_regs));

		release_mem_region(mem_start, A2065_RAM_SIZE);

		free_netdev(dev);

		return err;

	}

drivers/net/ariadne.c

+5 −5
Original line number Diff line number Diff line
@@ -182,14 +182,14 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, 
	return -EBUSY;

    r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM");

    if (!r2) {

	release_resource(r1);

	release_mem_region(base_addr, sizeof(struct Am79C960));

	return -EBUSY;

    }



    dev = alloc_etherdev(sizeof(struct ariadne_private));

    if (dev == NULL) {

	release_resource(r1);

	release_resource(r2);

	release_mem_region(base_addr, sizeof(struct Am79C960));

	release_mem_region(mem_start, ARIADNE_RAM_SIZE);

	return -ENOMEM;

    }
@@ -213,8 +213,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, 


    err = register_netdev(dev);

    if (err) {

	release_resource(r1);

	release_resource(r2);

	release_mem_region(base_addr, sizeof(struct Am79C960));

	release_mem_region(mem_start, ARIADNE_RAM_SIZE);

	free_netdev(dev);

	return err;

    }

drivers/net/bonding/bond_main.c

+31 −25
Original line number Diff line number Diff line
@@ -1482,21 +1482,16 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
{

	struct sk_buff *skb = *pskb;

	struct slave *slave;

	struct net_device *bond_dev;

	struct bonding *bond;



	slave = bond_slave_get_rcu(skb->dev);

	bond_dev = ACCESS_ONCE(slave->dev->master);

	if (unlikely(!bond_dev))

		return RX_HANDLER_PASS;



	skb = skb_share_check(skb, GFP_ATOMIC);

	if (unlikely(!skb))

		return RX_HANDLER_CONSUMED;



	*pskb = skb;



	bond = netdev_priv(bond_dev);

	slave = bond_slave_get_rcu(skb->dev);

	bond = slave->bond;



	if (bond->params.arp_interval)

		slave->dev->last_rx = jiffies;
@@ -1505,10 +1500,10 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
		return RX_HANDLER_EXACT;

	}



	skb->dev = bond_dev;

	skb->dev = bond->dev;



	if (bond->params.mode == BOND_MODE_ALB &&

	    bond_dev->priv_flags & IFF_BRIDGE_PORT &&

	    bond->dev->priv_flags & IFF_BRIDGE_PORT &&

	    skb->pkt_type == PACKET_HOST) {



		if (unlikely(skb_cow_head(skb,
@@ -1516,7 +1511,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
			kfree_skb(skb);

			return RX_HANDLER_CONSUMED;

		}

		memcpy(eth_hdr(skb)->h_dest, bond_dev->dev_addr, ETH_ALEN);

		memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN);

	}



	return RX_HANDLER_ANOTHER;
@@ -1698,20 +1693,15 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
		pr_debug("Error %d calling netdev_set_bond_master\n", res);

		goto err_restore_mac;

	}

	res = netdev_rx_handler_register(slave_dev, bond_handle_frame,

					 new_slave);

	if (res) {

		pr_debug("Error %d calling netdev_rx_handler_register\n", res);

		goto err_unset_master;

	}



	/* open the slave since the application closed it */

	res = dev_open(slave_dev);

	if (res) {

		pr_debug("Opening slave %s failed\n", slave_dev->name);

		goto err_unreg_rxhandler;

		goto err_unset_master;

	}



	new_slave->bond = bond;

	new_slave->dev = slave_dev;

	slave_dev->priv_flags |= IFF_BONDING;
@@ -1907,6 +1897,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	if (res)

		goto err_close;



	res = netdev_rx_handler_register(slave_dev, bond_handle_frame,

					 new_slave);

	if (res) {

		pr_debug("Error %d calling netdev_rx_handler_register\n", res);

		goto err_dest_symlinks;

	}



	pr_info("%s: enslaving %s as a%s interface with a%s link.\n",

		bond_dev->name, slave_dev->name,

		bond_is_active_slave(new_slave) ? "n active" : " backup",
@@ -1916,13 +1913,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	return 0;



/* Undo stages on error */

err_dest_symlinks:

	bond_destroy_slave_symlinks(bond_dev, slave_dev);



err_close:

	dev_close(slave_dev);



err_unreg_rxhandler:

	netdev_rx_handler_unregister(slave_dev);

	synchronize_net();



err_unset_master:

	netdev_set_bond_master(slave_dev, NULL);
@@ -1988,6 +1984,14 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) 
		return -EINVAL;

	}



	/* unregister rx_handler early so bond_handle_frame wouldn't be called

	 * for this slave anymore.

	 */

	netdev_rx_handler_unregister(slave_dev);

	write_unlock_bh(&bond->lock);

	synchronize_net();

	write_lock_bh(&bond->lock);



	if (!bond->params.fail_over_mac) {

		if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) &&

		    bond->slave_cnt > 1)
@@ -2104,8 +2108,6 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) 
		netif_addr_unlock_bh(bond_dev);

	}



	netdev_rx_handler_unregister(slave_dev);

	synchronize_net();

	netdev_set_bond_master(slave_dev, NULL);



	slave_disable_netpoll(slave);
@@ -2186,6 +2188,12 @@ static int bond_release_all(struct net_device *bond_dev) 
		 */

		write_unlock_bh(&bond->lock);



		/* unregister rx_handler early so bond_handle_frame wouldn't

		 * be called for this slave anymore.

		 */

		netdev_rx_handler_unregister(slave_dev);

		synchronize_net();



		if (bond_is_lb(bond)) {

			/* must be called only after the slave

			 * has been detached from the list
@@ -2217,8 +2225,6 @@ static int bond_release_all(struct net_device *bond_dev) 
			netif_addr_unlock_bh(bond_dev);

		}



		netdev_rx_handler_unregister(slave_dev);

		synchronize_net();

		netdev_set_bond_master(slave_dev, NULL);



		slave_disable_netpoll(slave);

drivers/net/bonding/bonding.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ struct slave { 
	struct net_device *dev; /* first - useful for panic debug */

	struct slave *next;

	struct slave *prev;

	struct bonding *bond; /* our master */

	int    delay;

	unsigned long jiffies;

	unsigned long last_arp_rx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE