Convert files to UTF-8 and some cleanups

[mirror_ubuntu-bionic-kernel.git] / drivers / net / ariadne.c

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index a0e68e7185318613d4aabfe0269f609c8b0950d2..10f3a196be32b729c5ddb075d72f39a0c82199ff 100644 (file)
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -1,7 +1,7 @@
 /*
  *  Amiga Linux/m68k Ariadne Ethernet Driver
  *
- *  © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
+ *  © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
  *                          Peter De Schrijver (p2@mind.be)
  *
  *  ---------------------------------------------------------------------------
@@ -166,6 +166,7 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
     struct net_device *dev;
     struct ariadne_private *priv;
     int err;
+    DECLARE_MAC_BUF(mac);
 
     r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960");
     if (!r1)
@@ -183,7 +184,6 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
        return -ENOMEM;
     }
 
-    SET_MODULE_OWNER(dev);
     priv = netdev_priv(dev);
 
     r1->name = dev->name;
@@ -217,9 +217,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
     zorro_set_drvdata(z, dev);
 
     printk(KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address "
-          "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, board,
-          dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-          dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+          "%s\n", dev->name, board,
+          print_mac(mac, dev->dev_addr));
 
     return 0;
 }
@@ -615,21 +614,17 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
     /* Fill in a Tx ring entry */
 
 #if 0
-    printk(KERN_DEBUG "TX pkt type 0x%04x from ", ((u_short *)skb->data)[6]);
-    {
-       int i;
-       u_char *ptr = &((u_char *)skb->data)[6];
-       for (i = 0; i < 6; i++)
-           printk("%02x", ptr[i]);
-    }
-    printk(" to ");
-    {
-       int i;
-       u_char *ptr = (u_char *)skb->data;
-       for (i = 0; i < 6; i++)
-           printk("%02x", ptr[i]);
-    }
-    printk(" data 0x%08x len %d\n", (int)skb->data, (int)skb->len);
+{
+    DECLARE_MAC_BUF(mac);
+    DECLARE_MAC_BUF(mac2);
+
+    printk(KERN_DEBUG "TX pkt type 0x%04x from %s to %s "
+          " data 0x%08x len %d\n",
+          ((u_short *)skb->data)[6],
+          print_mac(mac, ((const u8 *)skb->data)+6),
+          print_mac(mac, (const u8 *)skb->data),
+          (int)skb->data, (int)skb->len);
+}
 #endif
 
     local_irq_save(flags);
@@ -677,6 +672,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
        priv->cur_tx -= TX_RING_SIZE;
        priv->dirty_tx -= TX_RING_SIZE;
     }
+    priv->stats.tx_bytes += len;
 
     /* Trigger an immediate send poll. */
     lance->RAP = CSR0;         /* PCnet-ISA Controller Status */
@@ -745,25 +741,25 @@ static int ariadne_rx(struct net_device *dev)
 
            skb_reserve(skb,2);         /* 16 byte align */
            skb_put(skb,pkt_len);       /* Make room */
-           eth_copy_and_sum(skb, (char *)priv->rx_buff[entry], pkt_len,0);
+           skb_copy_to_linear_data(skb, (char *)priv->rx_buff[entry], pkt_len);
            skb->protocol=eth_type_trans(skb,dev);
 #if 0
+{
+           DECLARE_MAC_BUF(mac);
+
            printk(KERN_DEBUG "RX pkt type 0x%04x from ",
                   ((u_short *)skb->data)[6]);
            {
-               int i;
                u_char *ptr = &((u_char *)skb->data)[6];
-               for (i = 0; i < 6; i++)
-                   printk("%02x", ptr[i]);
+               printk("%s", print_mac(mac, ptr));
            }
            printk(" to ");
            {
-               int i;
                u_char *ptr = (u_char *)skb->data;
-               for (i = 0; i < 6; i++)
-                   printk("%02x", ptr[i]);
+               printk("%s", print_mac(mac, ptr));
            }
            printk(" data 0x%08x len %d\n", (int)skb->data, (int)skb->len);
+}
 #endif
 
            netif_rx(skb);