Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index bfa10c3da35f..c9f77c324535 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1521,9 +1521,15 @@ fec_enet_rx(struct net_device *ndev, int budget)
         struct fec_enet_private *fep = netdev_priv(ndev);
 
         for_each_set_bit(queue_id, &fep->work_rx, FEC_ENET_MAX_RX_QS) {
-                clear_bit(queue_id, &fep->work_rx);
-                pkt_received += fec_enet_rx_queue(ndev,
+                int ret;
+
+                ret = fec_enet_rx_queue(ndev,
                                         budget - pkt_received, queue_id);
+
+                if (ret < budget - pkt_received)
+                        clear_bit(queue_id, &fep->work_rx);
+
+                pkt_received += ret;
         }
         return pkt_received;
 }