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

Commit 23ead729 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: (37 commits)
  ucc_geth: use correct UCCE macros
  net_dma: acquire/release dma channels on ifup/ifdown
  cxgb3: Keep LRO off if disabled when interface is down
  sfc: SFT9001: Fix condition for LNPGA power-off
  dccp ccid-3: Fix RFC reference
  smsc911x: register irq with device name, not driver name
  smsc911x: fix smsc911x_reg_read compiler warning
  forcedeth: napi schedule lock fix
  net: fix section mismatch warnings in dccp/ccids/lib/tfrc.c
  forcedeth: remove mgmt unit for mcp79 chipset
  qlge: Remove dynamic alloc of rx ring control blocks.
  qlge: Fix schedule while atomic issue.
  qlge: Remove support for device ID 8000.
  qlge: Get rid of split addresses in hardware control blocks.
  qlge: Get rid of volatile usage for shadow register.
  forcedeth: version bump and copyright
  forcedeth: xmit lock fix
  netdev: missing validate_address hooks
  netdev: add missing set_mac_address hook
  netdev: gianfar: add MII ioctl handler
  ...
parents 54c26687 3bc53427

drivers/net/3c503.c

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static const struct net_device_ops el2_netdev_ops = { 
	.ndo_get_stats		= eip_get_stats,

	.ndo_set_multicast_list = eip_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller 	= eip_poll,

drivers/net/3c59x.c

+2 −0
Original line number Diff line number Diff line
@@ -3109,6 +3109,8 @@ static void acpi_set_WOL(struct net_device *dev) 
	struct vortex_private *vp = netdev_priv(dev);

	void __iomem *ioaddr = vp->ioaddr;



	device_set_wakeup_enable(vp->gendev, vp->enable_wol);



	if (vp->enable_wol) {

		/* Power up on: 1==Downloaded Filter, 2==Magic Packets, 4==Link Status. */

		EL3WINDOW(7);

drivers/net/8139cp.c

+2 −0
Original line number Diff line number Diff line
@@ -1821,6 +1821,7 @@ static const struct net_device_ops cp_netdev_ops = { 
	.ndo_open		= cp_open,

	.ndo_stop		= cp_close,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_set_multicast_list	= cp_set_rx_mode,

	.ndo_get_stats		= cp_get_stats,

	.ndo_do_ioctl		= cp_ioctl,
@@ -1832,6 +1833,7 @@ static const struct net_device_ops cp_netdev_ops = { 
#ifdef BROKEN

	.ndo_change_mtu		= cp_change_mtu,

#endif



#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= cp_poll_controller,

#endif

drivers/net/8139too.c

+1 −1
Original line number Diff line number Diff line
@@ -917,6 +917,7 @@ static const struct net_device_ops rtl8139_netdev_ops = { 
	.ndo_stop		= rtl8139_close,

	.ndo_get_stats		= rtl8139_get_stats,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_start_xmit		= rtl8139_start_xmit,

	.ndo_set_multicast_list	= rtl8139_set_rx_mode,

	.ndo_do_ioctl		= netdev_ioctl,
@@ -924,7 +925,6 @@ static const struct net_device_ops rtl8139_netdev_ops = { 
#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= rtl8139_poll_controller,

#endif



};



static int __devinit rtl8139_init_one (struct pci_dev *pdev,

drivers/net/8390.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ const struct net_device_ops ei_netdev_ops = { 
	.ndo_get_stats		= ei_get_stats,

	.ndo_set_multicast_list = ei_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ei_poll,