--- 8139too.c   2021-02-10 11:12:10.000000000 +0300
+++ 8139too.c   2021-07-02 21:26:43.431528243 +0300
@@ -356,6 +356,7 @@
    RxOK        = 0x01,

    RxAckBits   = RxFIFOOver | RxOverflow | RxOK,
+   OtherAckBits    = PCIErr | PCSTimeout | RxUnderrun | RxErr | TxOK | TxErr,
 };

 enum TxStatusBits {
@@ -2128,21 +2129,49 @@
    struct rtl8139_private *tp = container_of(napi, struct rtl8139_private, napi);
    struct net_device *dev = tp->dev;
    void __iomem *ioaddr = tp->mmio_addr;
+   int link_changed = 0; /* avoid bogus "uninit" warning */
+   unsigned long flags;
+   u32 status;
+   u16 ackstat;
    int work_done;

    spin_lock(&tp->rx_lock);
+   spin_lock_irqsave(&tp->lock, flags);
    work_done = 0;
-   if (likely(RTL_R16(IntrStatus) & RxAckBits))
+
+   status = RTL_R16(IntrStatus);
+   if (status & RxAckBits)
        work_done += rtl8139_rx(dev, tp, budget);

-   if (work_done < budget) {
-       unsigned long flags;
+   if (status & OtherAckBits) {
+       /* Acknowledge all of the current interrupt sources ASAP, but
+          an first get an additional status bit from CSCR. */
+       if (unlikely(status & RxUnderrun))
+           link_changed = RTL_R16 (CSCR) & CSCR_LinkChangeBit;

-       spin_lock_irqsave(&tp->lock, flags);
-       if (napi_complete_done(napi, work_done))
+       ackstat = status & ~(RxAckBits | TxErr);
+       if (ackstat)
+           RTL_W16 (IntrStatus, ackstat);
+
+       /* Check uncommon events with one test. */
+       if (unlikely(status & (PCIErr | PCSTimeout | RxUnderrun | RxErr)))
+           rtl8139_weird_interrupt (dev, tp, ioaddr,
+                    status, link_changed);
+
+       if (status & (TxOK | TxErr)) {
+           rtl8139_tx_interrupt (dev, tp, ioaddr);
+           if (status & TxErr)
+               RTL_W16 (IntrStatus, TxErr);
+       }
+   }
+
+   if (work_done < budget) {
+       if (napi_complete_done(napi, work_done)) {
            RTL_W16_F(IntrMask, rtl8139_intr_mask);
-       spin_unlock_irqrestore(&tp->lock, flags);
+       }
    }
+
+   spin_unlock_irqrestore(&tp->lock, flags);
    spin_unlock(&tp->rx_lock);

    return work_done;
@@ -2155,8 +2184,7 @@
    struct net_device *dev = (struct net_device *) dev_instance;
    struct rtl8139_private *tp = netdev_priv(dev);
    void __iomem *ioaddr = tp->mmio_addr;
-   u16 status, ackstat;
-   int link_changed = 0; /* avoid bogus "uninit" warning */
+   u16 status;
    int handled = 0;

    spin_lock (&tp->lock);
@@ -2178,33 +2206,9 @@
        goto out;
    }

-   /* Acknowledge all of the current interrupt sources ASAP, but
-      an first get an additional status bit from CSCR. */
-   if (unlikely(status & RxUnderrun))
-       link_changed = RTL_R16 (CSCR) & CSCR_LinkChangeBit;
-
-   ackstat = status & ~(RxAckBits | TxErr);
-   if (ackstat)
-       RTL_W16 (IntrStatus, ackstat);
-
-   /* Receive packets are processed by poll routine.
-      If not running start it now. */
-   if (status & RxAckBits){
-       if (napi_schedule_prep(&tp->napi)) {
-           RTL_W16_F (IntrMask, rtl8139_norx_intr_mask);
-           __napi_schedule(&tp->napi);
-       }
-   }
-
-   /* Check uncommon events with one test. */
-   if (unlikely(status & (PCIErr | PCSTimeout | RxUnderrun | RxErr)))
-       rtl8139_weird_interrupt (dev, tp, ioaddr,
-                    status, link_changed);
-
-   if (status & (TxOK | TxErr)) {
-       rtl8139_tx_interrupt (dev, tp, ioaddr);
-       if (status & TxErr)
-           RTL_W16 (IntrStatus, TxErr);
+   if (napi_schedule_prep(&tp->napi)) {
+       RTL_W16_F (IntrMask, 0);
+       __napi_schedule(&tp->napi);
    }
  out:
    spin_unlock (&tp->lock);