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

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -6238,7 +6238,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
		}

		if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
		e_info("PHY reset is blocked due to SOL/IDER session.\n");
		dev_info(&pdev->dev,
		"PHY reset is blocked due to SOL/IDER session.\n");

		/* Set initial default active device features */
		netdev->features = (NETIF_F_SG \|
		@@ -6288,7 +6289,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
		if (e1000_validate_nvm_checksum(&adapter->hw) >= 0)
		break;
		if (i == 2) {
		e_err("The NVM Checksum Is Not Valid\n");
		dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
		err = -EIO;
		goto err_eeprom;
		}
		@@ -6298,13 +6299,15 @@ static int __devinit e1000_probe(struct pci_dev *pdev,

		/* copy the MAC address */
		if (e1000e_read_mac_addr(&adapter->hw))
		e_err("NVM Read Error while reading MAC address\n");
		dev_err(&pdev->dev,
		"NVM Read Error while reading MAC address\n");

		memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
		memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);

		if (!is_valid_ether_addr(netdev->perm_addr)) {
		e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
		dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
		netdev->perm_addr);
		err = -EIO;
		goto err_eeprom;
		}

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

+27 −16

Original line number	Diff line number	Diff line
		@@ -199,16 +199,19 @@ static int __devinit e1000_validate_option(unsigned int *value,
		case enable_option:
		switch (*value) {
		case OPTION_ENABLED:
		e_info("%s Enabled\n", opt->name);
		dev_info(&adapter->pdev->dev, "%s Enabled\n",
		opt->name);
		return 0;
		case OPTION_DISABLED:
		e_info("%s Disabled\n", opt->name);
		dev_info(&adapter->pdev->dev, "%s Disabled\n",
		opt->name);
		return 0;
		}
		break;
		case range_option:
		if (value >= opt->arg.r.min && value <= opt->arg.r.max) {
		e_info("%s set to %i\n", opt->name, *value);
		dev_info(&adapter->pdev->dev, "%s set to %i\n",
		opt->name, *value);
		return 0;
		}
		break;
		@@ -220,7 +223,8 @@ static int __devinit e1000_validate_option(unsigned int *value,
		ent = &opt->arg.l.p[i];
		if (*value == ent->i) {
		if (ent->str[0] != '\0')
		e_info("%s\n", ent->str);
		dev_info(&adapter->pdev->dev, "%s\n",
		ent->str);
		return 0;
		}
		}
		@@ -230,8 +234,8 @@ static int __devinit e1000_validate_option(unsigned int *value,
		BUG();
		}

		e_info("Invalid %s value specified (%i) %s\n", opt->name, *value,
		opt->err);
		dev_info(&adapter->pdev->dev, "Invalid %s value specified (%i) %s\n",
		opt->name, *value, opt->err);
		*value = opt->def;
		return -1;
		}
		@@ -251,8 +255,10 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
		int bd = adapter->bd_number;

		if (bd >= E1000_MAX_NIC) {
		e_notice("Warning: no configuration for board #%i\n", bd);
		e_notice("Using defaults for all values\n");
		dev_notice(&adapter->pdev->dev,
		"Warning: no configuration for board #%i\n", bd);
		dev_notice(&adapter->pdev->dev,
		"Using defaults for all values\n");
		}

		{ /* Transmit Interrupt Delay */
		@@ -366,26 +372,31 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
		* default values
		*/
		if (adapter->itr > 4)
		e_info("%s set to default %d\n", opt.name,
		dev_info(&adapter->pdev->dev,
		"%s set to default %d\n", opt.name,
		adapter->itr);
		}

		adapter->itr_setting = adapter->itr;
		switch (adapter->itr) {
		case 0:
		e_info("%s turned off\n", opt.name);
		dev_info(&adapter->pdev->dev, "%s turned off\n",
		opt.name);
		break;
		case 1:
		e_info("%s set to dynamic mode\n", opt.name);
		dev_info(&adapter->pdev->dev,
		"%s set to dynamic mode\n", opt.name);
		adapter->itr = 20000;
		break;
		case 3:
		e_info("%s set to dynamic conservative mode\n",
		dev_info(&adapter->pdev->dev,
		"%s set to dynamic conservative mode\n",
		opt.name);
		adapter->itr = 20000;
		break;
		case 4:
		e_info("%s set to simplified (2000-8000 ints) mode\n",
		dev_info(&adapter->pdev->dev,
		"%s set to simplified (2000-8000 ints) mode\n",
		opt.name);
		break;
		default:

drivers/net/ethernet/intel/ixgbe/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,11 +34,11 @@ obj-$(CONFIG_IXGBE) += ixgbe.o

		ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
		ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
		ixgbe_mbx.o ixgbe_x540.o ixgbe_sysfs.o ixgbe_lib.o
		ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o

		ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o \
		ixgbe_dcb_82599.o ixgbe_dcb_nl.o

		ixgbe-$(CONFIG_IXGBE_PTP) += ixgbe_ptp.o

		ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o
		ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -561,6 +561,7 @@ struct ixgbe_adapter {
		spinlock_t tmreg_lock;
		struct cyclecounter cc;
		struct timecounter tc;
		int rx_hwtstamp_filter;
		u32 base_incval;
		u32 cycle_speed;
		#endif /* CONFIG_IXGBE_PTP */
		@@ -718,6 +719,7 @@ extern void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter);
		extern void ixgbe_ptp_tx_hwtstamp(struct ixgbe_q_vector *q_vector,
		struct sk_buff *skb);
		extern void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector,
		union ixgbe_adv_rx_desc *rx_desc,
		struct sk_buff *skb);
		extern int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
		struct ifreq *ifr, int cmd);

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -790,12 +790,10 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
		total_packets += tx_buffer->gso_segs;

		#ifdef CONFIG_IXGBE_PTP
		if (unlikely(tx_buffer->tx_flags &
		IXGBE_TX_FLAGS_TSTAMP))
		ixgbe_ptp_tx_hwtstamp(q_vector,
		tx_buffer->skb);

		if (unlikely(tx_buffer->tx_flags & IXGBE_TX_FLAGS_TSTAMP))
		ixgbe_ptp_tx_hwtstamp(q_vector, tx_buffer->skb);
		#endif

		/* free the skb */
		dev_kfree_skb_any(tx_buffer->skb);

		@@ -1399,8 +1397,7 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
		ixgbe_rx_checksum(rx_ring, rx_desc, skb);

		#ifdef CONFIG_IXGBE_PTP
		if (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_TS))
		ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, skb);
		ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
		#endif

		if ((dev->features & NETIF_F_HW_VLAN_RX) &&