Commit 4366004d authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e9f0fb88 a450a685

Documentation/networking/scaling.txt

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ RPS and RFS were introduced in kernel 2.6.35. XPS was incorporated into 
(therbert@google.com)



Accelerated RFS was introduced in 2.6.35. Original patches were

submitted by Ben Hutchings (bhutchings@solarflare.com)

submitted by Ben Hutchings (bwh@kernel.org)



Authors:

Tom Herbert (therbert@google.com)

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -7674,7 +7674,6 @@ F: drivers/clk/samsung/ 
SAMSUNG SXGBE DRIVERS

M:	Byungho An <bh74.an@samsung.com>

M:	Girish K S <ks.giri@samsung.com>

M:	Siva Reddy Kallam <siva.kallam@samsung.com>

M:	Vipul Pandya <vipul.pandya@samsung.com>

S:	Supported

L:	netdev@vger.kernel.org

drivers/isdn/hisax/icc.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ icc_interrupt(struct IsdnCardState *cs, u_char val) 
				if (cs->debug & L1_DEB_MONITOR)

					debugl1(cs, "ICC %02x -> MOX1", cs->dc.icc.mon_tx[cs->dc.icc.mon_txp - 1]);

			}

		AfterMOX1:

		AfterMOX1: ;

#endif

		}

	}

drivers/net/ethernet/arc/emac_main.c

+14 −7
Original line number Diff line number Diff line
@@ -574,6 +574,18 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) 
	return NETDEV_TX_OK;

}



static void arc_emac_set_address_internal(struct net_device *ndev)

{

	struct arc_emac_priv *priv = netdev_priv(ndev);

	unsigned int addr_low, addr_hi;



	addr_low = le32_to_cpu(*(__le32 *) &ndev->dev_addr[0]);

	addr_hi = le16_to_cpu(*(__le16 *) &ndev->dev_addr[4]);



	arc_reg_set(priv, R_ADDRL, addr_low);

	arc_reg_set(priv, R_ADDRH, addr_hi);

}



/**

 * arc_emac_set_address - Set the MAC address for this device.

 * @ndev:	Pointer to net_device structure.
@@ -587,9 +599,7 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) 
 */

static int arc_emac_set_address(struct net_device *ndev, void *p)

{

	struct arc_emac_priv *priv = netdev_priv(ndev);

	struct sockaddr *addr = p;

	unsigned int addr_low, addr_hi;



	if (netif_running(ndev))

		return -EBUSY;
@@ -599,11 +609,7 @@ static int arc_emac_set_address(struct net_device *ndev, void *p) 


	memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);



	addr_low = le32_to_cpu(*(__le32 *) &ndev->dev_addr[0]);

	addr_hi = le16_to_cpu(*(__le16 *) &ndev->dev_addr[4]);



	arc_reg_set(priv, R_ADDRL, addr_low);

	arc_reg_set(priv, R_ADDRH, addr_hi);

	arc_emac_set_address_internal(ndev);



	return 0;

}
@@ -713,6 +719,7 @@ static int arc_emac_probe(struct platform_device *pdev) 
	else

		eth_hw_addr_random(ndev);



	arc_emac_set_address_internal(ndev);

	dev_info(&pdev->dev, "MAC address is now %pM\n", ndev->dev_addr);



	/* Do 1 allocation instead of 2 separate ones for Rx and Tx BD rings */

drivers/net/ethernet/intel/e1000e/netdev.c

+3 −3
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) 
		dev_kfree_skb_any(adapter->tx_hwtstamp_skb);

		adapter->tx_hwtstamp_skb = NULL;

		adapter->tx_hwtstamp_timeouts++;

		e_warn("clearing Tx timestamp hang");

		e_warn("clearing Tx timestamp hang\n");

	} else {

		/* reschedule to check later */

		schedule_work(&adapter->tx_hwtstamp_work);
@@ -5698,7 +5698,7 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev, 
static int e1000_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;

	int max_frame = new_mtu + VLAN_HLEN + ETH_HLEN + ETH_FCS_LEN;



	/* Jumbo frame support */

	if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
@@ -6247,6 +6247,7 @@ static int __e1000_resume(struct pci_dev *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int e1000e_pm_thaw(struct device *dev)

{

	struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));
@@ -6267,7 +6268,6 @@ static int e1000e_pm_thaw(struct device *dev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int e1000e_pm_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);