Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...

Jeff Kirsher says:

====================
This series contains updates to igb, ixgbe and e1000.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --combined drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e5f993e8069c5b5d568dc8e4dcf0a7d2c6f3fe5c,8b1a38bec2378b585ea1d970d0e38aac216060bf..b54bc40f00b0dbb8c4557b90c2d1c0e0bbd654b1
--- 1/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
--- 2/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@@ -841,8 -841,10 +841,8 @@@ static bool ixgbe_clean_tx_irq(struct i
                total_bytes += tx_buffer->bytecount;
                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);
 -#endif
  
                /* free the skb */
                dev_kfree_skb_any(tx_buffer->skb);
@@@ -1430,7 -1432,9 +1430,7 @@@ static void ixgbe_process_skb_fields(st
  
        ixgbe_rx_checksum(rx_ring, rx_desc, skb);
  
 -#ifdef CONFIG_IXGBE_PTP
        ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
 -#endif
  
        if ((dev->features & NETIF_F_HW_VLAN_RX) &&
            ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
@@@ -1972,20 -1976,6 +1972,6 @@@ static void ixgbe_configure_msix(struc
                ixgbe_for_each_ring(ring, q_vector->tx)
                        ixgbe_set_ivar(adapter, 1, ring->reg_idx, v_idx);
  
-               if (q_vector->tx.ring && !q_vector->rx.ring) {
-                       /* tx only vector */
-                       if (adapter->tx_itr_setting == 1)
-                               q_vector->itr = IXGBE_10K_ITR;
-                       else
-                               q_vector->itr = adapter->tx_itr_setting;
-               } else {
-                       /* rx or rx/tx vector */
-                       if (adapter->rx_itr_setting == 1)
-                               q_vector->itr = IXGBE_20K_ITR;
-                       else
-                               q_vector->itr = adapter->rx_itr_setting;
-               }
- 
                ixgbe_write_eitr(q_vector);
        }
  
@@@ -2382,8 -2372,10 +2368,8 @@@ static inline void ixgbe_irq_enable(str
                break;
        }
  
 -#ifdef CONFIG_IXGBE_PTP
        if (adapter->hw.mac.type == ixgbe_mac_X540)
                mask |= IXGBE_EIMS_TIMESYNC;
 -#endif
  
        if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) &&
            !(adapter->flags2 & IXGBE_FLAG2_FDIR_REQUIRES_REINIT))
@@@ -2449,8 -2441,10 +2435,8 @@@ static irqreturn_t ixgbe_msix_other(in
  
        ixgbe_check_fan_failure(adapter, eicr);
  
 -#ifdef CONFIG_IXGBE_PTP
        if (unlikely(eicr & IXGBE_EICR_TIMESYNC))
                ixgbe_ptp_check_pps_event(adapter, eicr);
 -#endif
  
        /* re-enable the original interrupt state, no lsc, no queues */
        if (!test_bit(__IXGBE_DOWN, &adapter->state))
@@@ -2642,8 -2636,10 +2628,8 @@@ static irqreturn_t ixgbe_intr(int irq, 
        }
  
        ixgbe_check_fan_failure(adapter, eicr);
 -#ifdef CONFIG_IXGBE_PTP
        if (unlikely(eicr & IXGBE_EICR_TIMESYNC))
                ixgbe_ptp_check_pps_event(adapter, eicr);
 -#endif
  
        /* would disable interrupts here but EIAM disabled it */
        napi_schedule(&q_vector->napi);
@@@ -2751,12 -2747,6 +2737,6 @@@ static void ixgbe_configure_msi_and_leg
  {
        struct ixgbe_q_vector *q_vector = adapter->q_vector[0];
  
-       /* rx/tx vector */
-       if (adapter->rx_itr_setting == 1)
-               q_vector->itr = IXGBE_20K_ITR;
-       else
-               q_vector->itr = adapter->rx_itr_setting;
- 
        ixgbe_write_eitr(q_vector);
  
        ixgbe_set_ivar(adapter, 0, 0, 0);
@@@ -4241,8 -4231,10 +4221,8 @@@ void ixgbe_reset(struct ixgbe_adapter *
        if (hw->mac.san_mac_rar_index)
                hw->mac.ops.set_vmdq_san_mac(hw, VMDQ_P(0));
  
 -#ifdef CONFIG_IXGBE_PTP
        if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED)
                ixgbe_ptp_reset(adapter);
 -#endif
  }
  
  /**
@@@ -4949,7 -4941,9 +4929,7 @@@ static int ixgbe_open(struct net_devic
        if (err)
                goto err_set_queues;
  
 -#ifdef CONFIG_IXGBE_PTP
        ixgbe_ptp_init(adapter);
 -#endif /* CONFIG_IXGBE_PTP*/
  
        ixgbe_up_complete(adapter);
  
@@@ -4982,7 -4976,9 +4962,7 @@@ static int ixgbe_close(struct net_devic
  {
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
  
 -#ifdef CONFIG_IXGBE_PTP
        ixgbe_ptp_stop(adapter);
 -#endif
  
        ixgbe_down(adapter);
        ixgbe_free_irq(adapter);
@@@ -5545,8 -5541,10 +5525,8 @@@ static void ixgbe_watchdog_link_is_up(s
                break;
        }
  
 -#ifdef CONFIG_IXGBE_PTP
        if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED)
                ixgbe_ptp_start_cyclecounter(adapter);
 -#endif
  
        e_info(drv, "NIC Link is Up %s, Flow Control: %s\n",
               (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
@@@ -5591,8 -5589,10 +5571,8 @@@ static void ixgbe_watchdog_link_is_down
        if (ixgbe_is_sfp(hw) && hw->mac.type == ixgbe_mac_82598EB)
                adapter->flags2 |= IXGBE_FLAG2_SEARCH_FOR_SFP;
  
 -#ifdef CONFIG_IXGBE_PTP
        if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED)
                ixgbe_ptp_start_cyclecounter(adapter);
 -#endif
  
        e_info(drv, "NIC Link is Down\n");
        netif_carrier_off(netdev);
@@@ -5897,7 -5897,9 +5877,7 @@@ static void ixgbe_service_task(struct w
        ixgbe_watchdog_subtask(adapter);
        ixgbe_fdir_reinit_subtask(adapter);
        ixgbe_check_hang_subtask(adapter);
 -#ifdef CONFIG_IXGBE_PTP
        ixgbe_ptp_overflow_check(adapter);
 -#endif
  
        ixgbe_service_event_complete(adapter);
  }
@@@ -6050,8 -6052,10 +6030,8 @@@ static __le32 ixgbe_tx_cmd_type(u32 tx_
        if (tx_flags & IXGBE_TX_FLAGS_HW_VLAN)
                cmd_type |= cpu_to_le32(IXGBE_ADVTXD_DCMD_VLE);
  
 -#ifdef CONFIG_IXGBE_PTP
        if (tx_flags & IXGBE_TX_FLAGS_TSTAMP)
                cmd_type |= cpu_to_le32(IXGBE_ADVTXD_MAC_TSTAMP);
 -#endif
  
        /* set segmentation enable bits for TSO/FSO */
  #ifdef IXGBE_FCOE
@@@ -6453,10 -6457,12 +6433,10 @@@ netdev_tx_t ixgbe_xmit_frame_ring(struc
  
        skb_tx_timestamp(skb);
  
 -#ifdef CONFIG_IXGBE_PTP
        if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
                skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
                tx_flags |= IXGBE_TX_FLAGS_TSTAMP;
        }
 -#endif
  
  #ifdef CONFIG_PCI_IOV
        /*
@@@ -6606,8 -6612,10 +6586,8 @@@ static int ixgbe_ioctl(struct net_devic
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
  
        switch (cmd) {
 -#ifdef CONFIG_IXGBE_PTP
        case SIOCSHWTSTAMP:
                return ixgbe_ptp_hwtstamp_ioctl(adapter, req, cmd);
 -#endif
        default:
                return mdio_mii_ioctl(&adapter->hw.phy.mdio, if_mii(req), cmd);
        }