patch-2.4.22 linux-2.4.22/drivers/net/8139too.c
Next file: linux-2.4.22/drivers/net/Config.in
Previous file: linux-2.4.22/drivers/net/8139cp.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/net/8139too.c
- Orig date:
2003-06-13 07:51:34.000000000 -0700
diff -urN linux-2.4.21/drivers/net/8139too.c linux-2.4.22/drivers/net/8139too.c
@@ -978,7 +978,7 @@
dev->irq = pdev->irq;
- /* dev->priv/tp zeroed and aligned in init_etherdev */
+ /* dev->priv/tp zeroed and aligned in alloc_etherdev */
tp = dev->priv;
/* note: tp->chipset set in rtl8139_init_board */
@@ -1687,7 +1687,7 @@
entry = tp->cur_tx % NUM_TX_DESC;
if (likely(len < TX_BUF_SIZE)) {
- if(len < ETH_ZLEN)
+ if (len < ETH_ZLEN)
memset(tp->tx_buf[entry], 0, ETH_ZLEN);
skb_copy_and_csum_dev(skb, tp->tx_buf[entry]);
dev_kfree_skb(skb);
@@ -2074,7 +2074,7 @@
RTL_W16 (IntrStatus, ackstat);
DPRINTK ("%s: interrupt status=%#4.4x ackstat=%#4.4x new intstat=%#4.4x.\n",
- dev->name, ackstat, status, RTL_R16 (IntrStatus));
+ dev->name, status, ackstat, RTL_R16 (IntrStatus));
if (netif_running (dev) && (status & RxAckBits))
rtl8139_rx_interrupt (dev, tp, ioaddr);
@@ -2146,7 +2146,7 @@
spin_unlock_irqrestore (&tp->lock, flags);
- synchronize_irq ();
+ synchronize_irq (); /* racy, but that's ok here */
free_irq (dev->irq, dev);
rtl8139_tx_clear (tp);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)