|
@@ -407,6 +407,7 @@ enum rtl_register_content {
|
|
|
RxOK = 0x0001,
|
|
|
|
|
|
/* RxStatusDesc */
|
|
|
+ RxBOVF = (1 << 24),
|
|
|
RxFOVF = (1 << 23),
|
|
|
RxRWT = (1 << 22),
|
|
|
RxRES = (1 << 21),
|
|
@@ -682,6 +683,7 @@ struct rtl8169_private {
|
|
|
struct mii_if_info mii;
|
|
|
struct rtl8169_counters counters;
|
|
|
u32 saved_wolopts;
|
|
|
+ u32 opts1_mask;
|
|
|
|
|
|
struct rtl_fw {
|
|
|
const struct firmware *fw;
|
|
@@ -3786,6 +3788,9 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
tp->intr_event = cfg->intr_event;
|
|
|
tp->napi_event = cfg->napi_event;
|
|
|
|
|
|
+ tp->opts1_mask = (tp->mac_version != RTL_GIGA_MAC_VER_01) ?
|
|
|
+ ~(RxBOVF | RxFOVF) : ~0;
|
|
|
+
|
|
|
init_timer(&tp->timer);
|
|
|
tp->timer.data = (unsigned long) dev;
|
|
|
tp->timer.function = rtl8169_phy_timer;
|
|
@@ -5324,7 +5329,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
|
|
|
u32 status;
|
|
|
|
|
|
rmb();
|
|
|
- status = le32_to_cpu(desc->opts1);
|
|
|
+ status = le32_to_cpu(desc->opts1) & tp->opts1_mask;
|
|
|
|
|
|
if (status & DescOwn)
|
|
|
break;
|