ACPI: battery: add sysfs serial number

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / arlan-main.c

diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index bb6bea4f32331fa026a037107ca57082dfe44cac..dbdfc9e39d20eec73f0e9424570010f9ac3022b0 100644 (file)
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -78,7 +78,7 @@ static int arlans_found;
 
 static  int    arlan_open(struct net_device *dev);
 static  int    arlan_tx(struct sk_buff *skb, struct net_device *dev);
-static  irqreturn_t arlan_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static  irqreturn_t arlan_interrupt(int irq, void *dev_id);
 static  int    arlan_close(struct net_device *dev);
 static  struct net_device_stats *
                arlan_statistics                (struct net_device *dev);
@@ -1469,10 +1469,10 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                                        while (dmi)
                                        {                                                       if (dmi->dmi_addrlen == 6)
                                                {
+                                                       DECLARE_MAC_BUF(mac);
                                                        if (arlan_debug & ARLAN_DEBUG_HEADER_DUMP)
-                                                               printk(KERN_ERR "%s mcl %2x:%2x:%2x:%2x:%2x:%2x \n", dev->name,
-                                                                                dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
-                                                                                dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
+                                                               printk(KERN_ERR "%s mcl %s\n",
+                                                                      dev->name, print_mac(mac, dmi->dmi_addr));
                                                        for (i = 0; i < 6; i++)
                                                                if (dmi->dmi_addr[i] != hw_dst_addr[i])
                                                                        break;
@@ -1500,7 +1500,6 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                                break;
                        }
                        skb_reserve(skb, 2);
-                       skb->dev = dev;
                        skbtmp = skb_put(skb, pkt_len);
 
                        memcpy_fromio(skbtmp + ARLAN_FAKE_HDR_LEN, ((char __iomem *) arlan) + rxOffset, pkt_len - ARLAN_FAKE_HDR_LEN);
@@ -1513,17 +1512,18 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                        {
                                char immedDestAddress[6];
                                char immedSrcAddress[6];
+                               DECLARE_MAC_BUF(mac);
+                               DECLARE_MAC_BUF(mac2);
+                               DECLARE_MAC_BUF(mac3);
+                               DECLARE_MAC_BUF(mac4);
                                memcpy_fromio(immedDestAddress, arlan->immedDestAddress, 6);
                                memcpy_fromio(immedSrcAddress, arlan->immedSrcAddress, 6);
 
-                               printk(KERN_WARNING "%s t %2x:%2x:%2x:%2x:%2x:%2x f %2x:%2x:%2x:%2x:%2x:%2x imd %2x:%2x:%2x:%2x:%2x:%2x ims %2x:%2x:%2x:%2x:%2x:%2x\n", dev->name,
-                                       (unsigned char) skbtmp[0], (unsigned char) skbtmp[1], (unsigned char) skbtmp[2], (unsigned char) skbtmp[3],
-                                       (unsigned char) skbtmp[4], (unsigned char) skbtmp[5], (unsigned char) skbtmp[6], (unsigned char) skbtmp[7],
-                                       (unsigned char) skbtmp[8], (unsigned char) skbtmp[9], (unsigned char) skbtmp[10], (unsigned char) skbtmp[11],
-                                       immedDestAddress[0], immedDestAddress[1], immedDestAddress[2],
-                                       immedDestAddress[3], immedDestAddress[4], immedDestAddress[5],
-                                       immedSrcAddress[0], immedSrcAddress[1], immedSrcAddress[2],
-                                       immedSrcAddress[3], immedSrcAddress[4], immedSrcAddress[5]);
+                               printk(KERN_WARNING "%s t %s f %s imd %s ims %s\n",
+                                      dev->name, print_mac(mac, skbtmp),
+                                      print_mac(mac2, &skbtmp[6]),
+                                      print_mac(mac3, immedDestAddress),
+                                      print_mac(mac4, immedSrcAddress));
                        }
                        skb->protocol = eth_type_trans(skb, dev);
                        IFDEBUG(ARLAN_DEBUG_HEADER_DUMP)
@@ -1651,7 +1651,7 @@ end_int_process:
        return;
 }
 
-static irqreturn_t arlan_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t arlan_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
        struct arlan_private *priv = netdev_priv(dev);
@@ -1793,8 +1793,6 @@ struct net_device * __init arlan_probe(int unit)
        if (!dev)
                return ERR_PTR(-ENOMEM);
 
-       SET_MODULE_OWNER(dev);
-
        if (unit >= 0) {
                sprintf(dev->name, "eth%d", unit);
                netdev_boot_setup_check(dev);