# HG changeset patch # User Florian Pose # Date 1238572988 0 # Node ID 6b51a2201d41d5a985575dcbd602ffe777afe3f4 # Parent 6cf0f0c9e3da202d716e98b0f30236f11b23df5e Fixed r8169 frame reception if NAPI is enabled. diff -r 6cf0f0c9e3da -r 6b51a2201d41 devices/r8169-2.6.24-ethercat.c --- a/devices/r8169-2.6.24-ethercat.c Thu Mar 19 08:46:45 2009 +0000 +++ b/devices/r8169-2.6.24-ethercat.c Wed Apr 01 08:03:08 2009 +0000 @@ -2991,7 +2991,16 @@ rtl8169_check_link_status(dev, tp, ioaddr); #ifdef CONFIG_R8169_NAPI - if (!tp->ecdev && (status & tp->napi_event)) { + if (tp->ecdev) { + /* Rx interrupt */ + if (status & (RxOK | RxOverflow | RxFIFOOver)) + rtl8169_rx_interrupt(dev, tp, ioaddr, ~(u32)0); + + /* Tx interrupt */ + if (status & (TxOK | TxErr)) + rtl8169_tx_interrupt(dev, tp, ioaddr); + + } else if (status & tp->napi_event) { RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event); tp->intr_mask = ~tp->napi_event;