redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] r8169: minor cleanup 

- more consistent prototypes;
- rtl8169_rx_interrupt()
  o the error condition should be rare;
  o goto removal.

Signed-off-by: Richard Dawe <rich@phekda.gotadsl.co.uk>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
hifive-unleashed-5.1
Richard Dawe 2005-05-27 21:12:00 +02:00 committed by Francois Romieu
parent d4a3a0fc9c
commit 4dcb7d3377
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/r8169.c
View File

@ -457,10 +457,10 @@ static void rtl8169_hw_start(struct net_device *dev);
static int rtl8169_close(struct net_device *dev); static int rtl8169_close(struct net_device *dev);
static void rtl8169_set_rx_mode(struct net_device *dev); static void rtl8169_set_rx_mode(struct net_device *dev);
static void rtl8169_tx_timeout(struct net_device *dev); static void rtl8169_tx_timeout(struct net_device *dev);
static struct net_device_stats *rtl8169_get_stats(struct net_device *netdev); static struct net_device_stats *rtl8169_get_stats(struct net_device *dev);
static int rtl8169_rx_interrupt(struct net_device *, struct rtl8169_private *, static int rtl8169_rx_interrupt(struct net_device *, struct rtl8169_private *,
void __iomem *); void __iomem *);
static int rtl8169_change_mtu(struct net_device *netdev, int new_mtu); static int rtl8169_change_mtu(struct net_device *dev, int new_mtu);
static void rtl8169_down(struct net_device *dev); static void rtl8169_down(struct net_device *dev);
#ifdef CONFIG_R8169_NAPI #ifdef CONFIG_R8169_NAPI
@ -2360,7 +2360,7 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx; rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
rx_left = rtl8169_rx_quota(rx_left, (u32) dev->quota); rx_left = rtl8169_rx_quota(rx_left, (u32) dev->quota);
while (rx_left > 0) { for (; rx_left > 0; rx_left--, cur_rx++) {
unsigned int entry = cur_rx % NUM_RX_DESC; unsigned int entry = cur_rx % NUM_RX_DESC;
struct RxDesc *desc = tp->RxDescArray + entry; struct RxDesc *desc = tp->RxDescArray + entry;
u32 status; u32 status;
@ -2370,7 +2370,7 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
if (status & DescOwn) if (status & DescOwn)
break; break;
if (status & RxRES) { if (unlikely(status & RxRES)) {
if (netif_msg_rx_err(tp)) { if (netif_msg_rx_err(tp)) {
printk(KERN_INFO printk(KERN_INFO
"%s: Rx ERROR. status = %08x\n", "%s: Rx ERROR. status = %08x\n",
@ -2397,7 +2397,7 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
tp->stats.rx_dropped++; tp->stats.rx_dropped++;
tp->stats.rx_length_errors++; tp->stats.rx_length_errors++;
rtl8169_mark_to_asic(desc, tp->rx_buf_sz); rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
goto move_on; continue;
} }
rtl8169_rx_csum(skb, desc); rtl8169_rx_csum(skb, desc);
@ -2426,9 +2426,6 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
tp->stats.rx_bytes += pkt_size; tp->stats.rx_bytes += pkt_size;
tp->stats.rx_packets++; tp->stats.rx_packets++;
} }
move_on:
cur_rx++;
rx_left--;
} }
count = cur_rx - tp->cur_rx; count = cur_rx - tp->cur_rx;