Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 (58bb4bd0) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/e1000e/ethtool.c

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1963,8 +1963,15 @@ static int e1000_set_coalesce(struct net_device *netdev,
	static int e1000_nway_reset(struct net_device *netdev)		static int e1000_nway_reset(struct net_device *netdev)
	{		{
	struct e1000_adapter *adapter = netdev_priv(netdev);		struct e1000_adapter *adapter = netdev_priv(netdev);
	if (netif_running(netdev))
			if (!netif_running(netdev))
			return -EAGAIN;

			if (!adapter->hw.mac.autoneg)
			return -EINVAL;

	e1000e_reinit_locked(adapter);		e1000e_reinit_locked(adapter);

	return 0;		return 0;
	}		}

	@@ -2006,7 +2013,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,

	switch (stringset) {		switch (stringset) {
	case ETH_SS_TEST:		case ETH_SS_TEST:
	memcpy(data, *e1000_gstrings_test, sizeof(e1000_gstrings_test));		memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test));
	break;		break;
	case ETH_SS_STATS:		case ETH_SS_STATS:
	for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {		for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1843,7 +1843,9 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
	int err = 0, vector = 0;		int err = 0, vector = 0;

	if (strlen(netdev->name) < (IFNAMSIZ - 5))		if (strlen(netdev->name) < (IFNAMSIZ - 5))
	sprintf(adapter->rx_ring->name, "%s-rx-0", netdev->name);		snprintf(adapter->rx_ring->name,
			sizeof(adapter->rx_ring->name) - 1,
			"%s-rx-0", netdev->name);
	else		else
	memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);		memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
	err = request_irq(adapter->msix_entries[vector].vector,		err = request_irq(adapter->msix_entries[vector].vector,
	@@ -1856,7 +1858,9 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
	vector++;		vector++;

	if (strlen(netdev->name) < (IFNAMSIZ - 5))		if (strlen(netdev->name) < (IFNAMSIZ - 5))
	sprintf(adapter->tx_ring->name, "%s-tx-0", netdev->name);		snprintf(adapter->tx_ring->name,
			sizeof(adapter->tx_ring->name) - 1,
			"%s-tx-0", netdev->name);
	else		else
	memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);		memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
	err = request_irq(adapter->msix_entries[vector].vector,		err = request_irq(adapter->msix_entries[vector].vector,

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -238,9 +238,15 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
	size = 14;		size = 14;
	nvm->word_size = 1 << size;		nvm->word_size = 1 << size;

	/* if 82576 then initialize mailbox parameters */		/* if part supports SR-IOV then initialize mailbox parameters */
	if (mac->type == e1000_82576)		switch (mac->type) {
			case e1000_82576:
			case e1000_i350:
	igb_init_mbx_params_pf(hw);		igb_init_mbx_params_pf(hw);
			break;
			default:
			break;
			}

	/* setup PHY parameters */		/* setup PHY parameters */
	if (phy->media_type != e1000_media_type_copper) {		if (phy->media_type != e1000_media_type_copper) {

+18 −20

Original line number	Original line	Diff line number	Diff line
	@@ -422,7 +422,6 @@ s32 igb_init_mbx_params_pf(struct e1000_hw *hw)
	{		{
	struct e1000_mbx_info *mbx = &hw->mbx;		struct e1000_mbx_info *mbx = &hw->mbx;

	if (hw->mac.type == e1000_82576) {
	mbx->timeout = 0;		mbx->timeout = 0;
	mbx->usec_delay = 0;		mbx->usec_delay = 0;

	@@ -441,7 +440,6 @@ s32 igb_init_mbx_params_pf(struct e1000_hw *hw)
	mbx->stats.reqs = 0;		mbx->stats.reqs = 0;
	mbx->stats.acks = 0;		mbx->stats.acks = 0;
	mbx->stats.rsts = 0;		mbx->stats.rsts = 0;
	}

	return 0;		return 0;
	}		}

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2287,9 +2287,14 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)

	spin_lock_init(&adapter->stats64_lock);		spin_lock_init(&adapter->stats64_lock);
	#ifdef CONFIG_PCI_IOV		#ifdef CONFIG_PCI_IOV
	if (hw->mac.type == e1000_82576)		switch (hw->mac.type) {
			case e1000_82576:
			case e1000_i350:
	adapter->vfs_allocated_count = (max_vfs > 7) ? 7 : max_vfs;		adapter->vfs_allocated_count = (max_vfs > 7) ? 7 : max_vfs;
			break;
			default:
			break;
			}
	#endif /* CONFIG_PCI_IOV */		#endif /* CONFIG_PCI_IOV */
	adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());		adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());