Commit cd978249 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: (64 commits)
  phylib: Fix delay argument of schedule_delayed_work
  NET/ixgbe: Fix powering off during shutdown
  NET/e1000e: Fix powering off during shutdown
  NET/e1000: Fix powering off during shutdown
  packet: avoid warnings when high-order page allocation fails
  gianfar: stop send queue before resetting gianfar
  myr10ge: again fix lro_gen_skb() alignment
  declance: convert to net_device_ops
  bfin_mac: convert to net_device_ops
  au1000: convert to net_device_ops
  atarilance: convert to net_device_ops
  a2065: convert to net_device_ops
  ixgbe: update real_num_tx_queues on changing num_rx_queues
  ixgbe: fix tx queue index
  Revert "rose: zero length frame filtering in af_rose.c"
  sfc: Use correct macro to set event bitfield
  sfc: Match calls to netif_napi_add() and netif_napi_del()
  bonding: Remove debug printk
  e1000/e1000: fix compile warning
  ehea: Fix incomplete conversion to net_device_ops
  ...
parents 3307f19f 3664090e

Documentation/networking/bonding.txt

+1 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ monitoring is enabled, and vice-versa. 
To add ARP targets:

# echo +192.168.0.100 > /sys/class/net/bond0/bonding/arp_ip_target

# echo +192.168.0.101 > /sys/class/net/bond0/bonding/arp_ip_target

	NOTE:  up to 10 target addresses may be specified.

	NOTE:  up to 16 target addresses may be specified.



To remove an ARP target:

# echo -192.168.0.100 > /sys/class/net/bond0/bonding/arp_ip_target

MAINTAINERS

+3 −10
Original line number Diff line number Diff line
@@ -3917,19 +3917,12 @@ F: Documentation/blockdev/nbd.txt 
F:	drivers/block/nbd.c

F:	include/linux/nbd.h



NETWORK DEVICE DRIVERS

P:	Jeff Garzik

M:	jgarzik@pobox.com

L:	netdev@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git

S:	Maintained

F:	drivers/net/



NETWORKING [GENERAL]

P:	Networking Team

M:	netdev@vger.kernel.org

P:	David S. Miller

M:	davem@davemloft.net

L:	netdev@vger.kernel.org

W:	http://linux-net.osdl.org/

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

S:	Maintained

F:	net/

F:	include/net/

drivers/net/a2065.c

+12 −5
Original line number Diff line number Diff line
@@ -692,6 +692,17 @@ static struct zorro_driver a2065_driver = { 
	.remove		= __devexit_p(a2065_remove_one),

};



static const struct net_device_ops lance_netdev_ops = {

	.ndo_open		= lance_open,

	.ndo_stop		= lance_close,

	.ndo_start_xmit		= lance_start_xmit,

	.ndo_tx_timeout		= lance_tx_timeout,

	.ndo_set_multicast_list	= lance_set_multicast,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address	= eth_mac_addr,

};



static int __devinit a2065_init_one(struct zorro_dev *z,

				    const struct zorro_device_id *ent)

{
@@ -753,12 +764,8 @@ static int __devinit a2065_init_one(struct zorro_dev *z, 
	priv->rx_ring_mod_mask = RX_RING_MOD_MASK;

	priv->tx_ring_mod_mask = TX_RING_MOD_MASK;



	dev->open = &lance_open;

	dev->stop = &lance_close;

	dev->hard_start_xmit = &lance_start_xmit;

	dev->tx_timeout = &lance_tx_timeout;

	dev->netdev_ops = &lance_netdev_ops;

	dev->watchdog_timeo = 5*HZ;

	dev->set_multicast_list = &lance_set_multicast;

	dev->dma = 0;



	init_timer(&priv->multicast_timer);

drivers/net/ariadne.c

+13 −6
Original line number Diff line number Diff line
@@ -155,6 +155,18 @@ static struct zorro_driver ariadne_driver = { 
    .remove	= __devexit_p(ariadne_remove_one),

};



static const struct net_device_ops ariadne_netdev_ops = {

	.ndo_open		= ariadne_open,

	.ndo_stop		= ariadne_close,

	.ndo_start_xmit		= ariadne_start_xmit,

	.ndo_tx_timeout		= ariadne_tx_timeout,

	.ndo_get_stats		= ariadne_get_stats,

	.ndo_set_multicast_list	= set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address	= eth_mac_addr,

};



static int __devinit ariadne_init_one(struct zorro_dev *z,

				      const struct zorro_device_id *ent)

{
@@ -197,13 +209,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, 
    dev->mem_start = ZTWO_VADDR(mem_start);

    dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE;



    dev->open = &ariadne_open;

    dev->stop = &ariadne_close;

    dev->hard_start_xmit = &ariadne_start_xmit;

    dev->tx_timeout = &ariadne_tx_timeout;

    dev->netdev_ops = &ariadne_netdev_ops;

    dev->watchdog_timeo = 5*HZ;

    dev->get_stats = &ariadne_get_stats;

    dev->set_multicast_list = &set_multicast_list;



    err = register_netdev(dev);

    if (err) {

drivers/net/arm/am79c961a.c

+15 −9
Original line number Diff line number Diff line
@@ -665,6 +665,20 @@ static void __init am79c961_banner(void) 
	if (net_debug && version_printed++ == 0)

		printk(KERN_INFO "%s", version);

}

static const struct net_device_ops am79c961_netdev_ops = {

	.ndo_open		= am79c961_open,

	.ndo_stop		= am79c961_close,

	.ndo_start_xmit		= am79c961_sendpacket,

	.ndo_get_stats		= am79c961_getstats,

	.ndo_set_multicast_list	= am79c961_setmulticastlist,

	.ndo_tx_timeout		= am79c961_timeout,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address	= eth_mac_addr,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= am79c961_poll_controller,

#endif

};



static int __init am79c961_probe(struct platform_device *pdev)

{
@@ -732,15 +746,7 @@ static int __init am79c961_probe(struct platform_device *pdev) 
	if (am79c961_hw_init(dev))

		goto release;



	dev->open		= am79c961_open;

	dev->stop		= am79c961_close;

	dev->hard_start_xmit	= am79c961_sendpacket;

	dev->get_stats		= am79c961_getstats;

	dev->set_multicast_list	= am79c961_setmulticastlist;

	dev->tx_timeout		= am79c961_timeout;

#ifdef CONFIG_NET_POLL_CONTROLLER

	dev->poll_controller	= am79c961_poll_controller;

#endif

	dev->netdev_ops = &am79c961_netdev_ops;



	ret = register_netdev(dev);

	if (ret == 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE