1 files changed, 1 insertions, 10 deletions

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 77aca5d67b57..3ee2a4548cba 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -182,7 +182,6 @@ static int efx_process_channel(struct efx_channel *channel, int rx_quota)
                 channel->rx_pkt = NULL;
         }
 
-        efx_flush_lro(channel);
         efx_rx_strategy(channel);
 
         efx_fast_push_rx_descriptors(&efx->rx_queue[channel->channel]);
@@ -1269,18 +1268,11 @@ static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
 static int efx_init_napi(struct efx_nic *efx)
 {
         struct efx_channel *channel;
-        int rc;
 
         efx_for_each_channel(channel, efx) {
                 channel->napi_dev = efx->net_dev;
-                rc = efx_lro_init(&channel->lro_mgr, efx);
-                if (rc)
-                        goto err;
         }
         return 0;
- err:
-        efx_fini_napi(efx);
-        return rc;
 }
 
 static void efx_fini_napi(struct efx_nic *efx)
@@ -1288,7 +1280,6 @@ static void efx_fini_napi(struct efx_nic *efx)
         struct efx_channel *channel;
 
         efx_for_each_channel(channel, efx) {
-                efx_lro_fini(&channel->lro_mgr);
                 channel->napi_dev = NULL;
         }
 }
@@ -2097,7 +2088,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
         net_dev->features |= (NETIF_F_IP_CSUM | NETIF_F_SG |
                               NETIF_F_HIGHDMA | NETIF_F_TSO);
         if (lro)
-                net_dev->features |= NETIF_F_LRO;
+                net_dev->features |= NETIF_F_GRO;
         /* Mask for features that also apply to VLAN devices */
         net_dev->vlan_features |= (NETIF_F_ALL_CSUM | NETIF_F_SG |
                                    NETIF_F_HIGHDMA | NETIF_F_TSO);