Commit e4b5c7a5 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

r8169: improve rtl8169_rx_fill

We have only one user of the error path, so we can inline it.
In addition the call to rtl8169_make_unusable_by_asic() can be removed
because rtl8169_alloc_rx_data() didn't call rtl8169_mark_to_asic() yet
for the respective index if returning NULL.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cb83b21
...@@ -5493,18 +5493,15 @@ static int rtl8169_rx_fill(struct rtl8169_private *tp) ...@@ -5493,18 +5493,15 @@ static int rtl8169_rx_fill(struct rtl8169_private *tp)
data = rtl8169_alloc_rx_data(tp, tp->RxDescArray + i); data = rtl8169_alloc_rx_data(tp, tp->RxDescArray + i);
if (!data) { if (!data) {
rtl8169_make_unusable_by_asic(tp->RxDescArray + i); rtl8169_rx_clear(tp);
goto err_out; return -ENOMEM;
} }
tp->Rx_databuff[i] = data; tp->Rx_databuff[i] = data;
} }
rtl8169_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1); rtl8169_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1);
return 0;
err_out: return 0;
rtl8169_rx_clear(tp);
return -ENOMEM;
} }
static int rtl8169_init_ring(struct rtl8169_private *tp) static int rtl8169_init_ring(struct rtl8169_private *tp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment