diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-10-23 21:36:14 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-10-25 20:28:59 -0700 |
| commit | e4b5c7a582a75f1de54620447854bc5a29011637 (patch) | |
| tree | a5990771c79689017906e71001d20c430042836b /drivers/net/ethernet | |
| parent | r8169: align fix_features callback with vendor driver (diff) | |
| download | linux-dev-e4b5c7a582a75f1de54620447854bc5a29011637.tar.xz linux-dev-e4b5c7a582a75f1de54620447854bc5a29011637.zip | |
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: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 43ffd4f49c09..91978ce92e20 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5493,18 +5493,15 @@ static int rtl8169_rx_fill(struct rtl8169_private *tp) data = rtl8169_alloc_rx_data(tp, tp->RxDescArray + i); if (!data) { - rtl8169_make_unusable_by_asic(tp->RxDescArray + i); - goto err_out; + rtl8169_rx_clear(tp); + return -ENOMEM; } tp->Rx_databuff[i] = data; } rtl8169_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1); - return 0; -err_out: - rtl8169_rx_clear(tp); - return -ENOMEM; + return 0; } static int rtl8169_init_ring(struct rtl8169_private *tp) |