1 files changed, 31 insertions, 3 deletions

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 34788fbb4c66..5b66c5ecf6a1 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2075,7 +2075,7 @@ static int efx_set_features(struct net_device *net_dev, netdev_features_t data)
         return 0;
 }
 
-static const struct net_device_ops efx_netdev_ops = {
+static const struct net_device_ops efx_farch_netdev_ops = {
         .ndo_open               = efx_net_open,
         .ndo_stop               = efx_net_stop,
         .ndo_get_stats64        = efx_net_stats,
@@ -2102,6 +2102,26 @@ static const struct net_device_ops efx_netdev_ops = {
 #endif
 };
 
+static const struct net_device_ops efx_ef10_netdev_ops = {
+        .ndo_open               = efx_net_open,
+        .ndo_stop               = efx_net_stop,
+        .ndo_get_stats64        = efx_net_stats,
+        .ndo_tx_timeout         = efx_watchdog,
+        .ndo_start_xmit         = efx_hard_start_xmit,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_do_ioctl           = efx_ioctl,
+        .ndo_change_mtu         = efx_change_mtu,
+        .ndo_set_mac_address    = efx_set_mac_address,
+        .ndo_set_rx_mode        = efx_set_rx_mode,
+        .ndo_set_features       = efx_set_features,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = efx_netpoll,
+#endif
+#ifdef CONFIG_RFS_ACCEL
+        .ndo_rx_flow_steer      = efx_filter_rfs,
+#endif
+};
+
 static void efx_update_name(struct efx_nic *efx)
 {
         strcpy(efx->name, efx->net_dev->name);
@@ -2114,7 +2134,8 @@ static int efx_netdev_event(struct notifier_block *this,
 {
         struct net_device *net_dev = netdev_notifier_info_to_dev(ptr);
 
-        if (net_dev->netdev_ops == &efx_netdev_ops &&
+        if ((net_dev->netdev_ops == &efx_farch_netdev_ops ||
+             net_dev->netdev_ops == &efx_ef10_netdev_ops) &&
             event == NETDEV_CHANGENAME)
                 efx_update_name(netdev_priv(net_dev));
 
@@ -2141,7 +2162,12 @@ static int efx_register_netdev(struct efx_nic *efx)
 
         net_dev->watchdog_timeo = 5 * HZ;
         net_dev->irq = efx->pci_dev->irq;
-        net_dev->netdev_ops = &efx_netdev_ops;
+        if (efx_nic_rev(efx) >= EFX_REV_HUNT_A0) {
+                net_dev->netdev_ops = &efx_ef10_netdev_ops;
+                net_dev->priv_flags |= IFF_UNICAST_FLT;
+        } else {
+                net_dev->netdev_ops = &efx_farch_netdev_ops;
+        }
         SET_ETHTOOL_OPS(net_dev, &efx_ethtool_ops);
         net_dev->gso_max_segs = EFX_TSO_MAX_SEGS;
 
@@ -2463,6 +2489,8 @@ static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {
          .driver_data = (unsigned long) &siena_a0_nic_type},
         {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813),  /* SFL9021 */
          .driver_data = (unsigned long) &siena_a0_nic_type},
+        {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0903),  /* SFC9120 PF */
+         .driver_data = (unsigned long) &efx_hunt_a0_nic_type},
         {0}                     /* end of list */
 };