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

Commit 38e5781b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  igmp: Avoid zero delay when receiving odd mixture of IGMP queries
  netdev: make net_device_ops const
  bcm63xx: make ethtool_ops const
  usbnet: make ethtool_ops const
  net: Fix build with INET disabled.
  net: introduce netif_addr_lock_nested() and call if when appropriate
  net: correct lock name in dev_[uc/mc]_sync documentations.
  net: sk_update_clone is only used in net/core/sock.c
  8139cp: fix missing napi_gro_flush.
  pktgen: set correct max and min in pktgen_setup_inject()
  smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
  asix: fix infinite loop in rx_fixup()
  net: Default UDP and UNIX diag to 'n'.
  r6040: fix typo in use of MCR0 register bits
  net: fix sock_clone reference mismatch with tcp memcontrol
parents 979ecef5 a8c1f65c

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+1 −1
Original line number Diff line number Diff line
@@ -1469,7 +1469,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev, 
	return 0;

}



static struct ethtool_ops bcm_enet_ethtool_ops = {

static const struct ethtool_ops bcm_enet_ethtool_ops = {

	.get_strings		= bcm_enet_get_strings,

	.get_sset_count		= bcm_enet_get_sset_count,

	.get_ethtool_stats      = bcm_enet_get_ethtool_stats,

drivers/net/ethernet/emulex/benet/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3080,7 +3080,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *fw_file) 
	return status;

}



static struct net_device_ops be_netdev_ops = {

static const struct net_device_ops be_netdev_ops = {

	.ndo_open		= be_open,

	.ndo_stop		= be_close,

	.ndo_start_xmit		= be_xmit,

drivers/net/ethernet/rdc/r6040.c

+1 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, 
	lp->dev = dev;



	/* Init RDC private data */

	lp->mcr0 = MCR0_XMTEN | MCR0;

	lp->mcr0 = MCR0_XMTEN | MCR0_RCVEN;



	/* The RDC-specific entries in the device structure. */

	dev->netdev_ops = &r6040_netdev_ops;

drivers/net/ethernet/realtek/8139cp.c

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
		if (cpr16(IntrStatus) & cp_rx_intr_mask)

			goto rx_status_loop;



		napi_gro_flush(napi);

		spin_lock_irqsave(&cp->lock, flags);

		__napi_complete(napi);

		cpw16_f(IntrMask, cp_intr_mask);

drivers/net/ethernet/smsc/smsc911x.h

+0 −2
Original line number Diff line number Diff line
@@ -401,8 +401,6 @@ 
#include <asm/smsc911x.h>

#endif



#ifdef CONFIG_SMSC_PHY

#include <linux/smscphy.h>

#endif



#endif				/* __SMSC911X_H__ */