regulator: code shrink (v2)

[safe/jmp/linux-2.6] / drivers / block / aoe / aoenet.c

diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 9e6f51c..30de5b1 100644 (file)
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoenet.c
  * Ethernet portion of AoE driver
@@ -8,6 +8,8 @@
 #include <linux/blkdev.h>
 #include <linux/netdevice.h>
 #include <linux/moduleparam.h>
+#include <net/net_namespace.h>
+#include <asm/unaligned.h>
 #include "aoe.h"
 
 #define NECODES 5
@@ -28,7 +30,7 @@ enum {
 
 static char aoe_iflist[IFLISTSZ];
 module_param_string(aoe_iflist, aoe_iflist, IFLISTSZ, 0600);
-MODULE_PARM_DESC(aoe_iflist, "aoe_iflist=\"dev1 [dev2 ...]\"\n");
+MODULE_PARM_DESC(aoe_iflist, "aoe_iflist=\"dev1 [dev2 ...]\"");
 
 #ifndef MODULE
 static int __init aoe_iflist_setup(char *str)
@@ -74,44 +76,20 @@ set_aoe_iflist(const char __user *user_str, size_t size)
                return -EINVAL;
 
        if (copy_from_user(aoe_iflist, user_str, size)) {
-               printk(KERN_INFO "aoe: %s: copy from user failed\n", __FUNCTION__);
+               printk(KERN_INFO "aoe: copy from user failed\n");
                return -EFAULT;
        }
        aoe_iflist[size] = 0x00;
        return 0;
 }
 
-u64
-mac_addr(char addr[6])
-{
-       __be64 n = 0;
-       char *p = (char *) &n;
-
-       memcpy(p + 2, addr, 6); /* (sizeof addr != 6) */
-
-       return __be64_to_cpu(n);
-}
-
-static struct sk_buff *
-skb_check(struct sk_buff *skb)
-{
-       if (skb_is_nonlinear(skb))
-       if ((skb = skb_share_check(skb, GFP_ATOMIC)))
-       if (skb_linearize(skb, GFP_ATOMIC) < 0) {
-               dev_kfree_skb(skb);
-               return NULL;
-       }
-       return skb;
-}
-
 void
-aoenet_xmit(struct sk_buff *sl)
+aoenet_xmit(struct sk_buff_head *queue)
 {
-       struct sk_buff *skb;
+       struct sk_buff *skb, *tmp;
 
-       while ((skb = sl)) {
-               sl = sl->next;
-               skb->next = skb->prev = NULL;
+       skb_queue_walk_safe(queue, skb, tmp) {
+               __skb_unlink(skb, queue);
                dev_queue_xmit(skb);
        }
 }
@@ -120,23 +98,25 @@ aoenet_xmit(struct sk_buff *sl)
  * (1) len doesn't include the header by default.  I want this. 
  */
 static int
-aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt)
+aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev)
 {
        struct aoe_hdr *h;
        u32 n;
 
-       skb = skb_check(skb);
-       if (!skb)
-               return 0;
+       if (dev_net(ifp) != &init_net)
+               goto exit;
 
+       skb = skb_share_check(skb, GFP_ATOMIC);
+       if (skb == NULL)
+               return 0;
+       if (skb_linearize(skb))
+               goto exit;
        if (!is_aoe_netif(ifp))
                goto exit;
-
-       //skb->len += ETH_HLEN; /* (1) */
        skb_push(skb, ETH_HLEN);        /* (1) */
 
-       h = (struct aoe_hdr *) skb->mac.raw;
-       n = be32_to_cpu(h->tag);
+       h = (struct aoe_hdr *) skb_mac_header(skb);
+       n = get_unaligned_be32(&h->tag);
        if ((h->verfl & AOEFL_RSP) == 0 || (n & 1<<31))
                goto exit;
 
@@ -145,10 +125,12 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt)
                if (n > NECODES)
                        n = 0;
                if (net_ratelimit())
-                       printk(KERN_ERR "aoe: aoenet_rcv: error packet from %d.%d; "
-                              "ecode=%d '%s'\n",
-                              be16_to_cpu(h->major), h->minor, 
-                              h->err, aoe_errlist[n]);
+                       printk(KERN_ERR
+                               "%s%d.%d@%s; ecode=%d '%s'\n",
+                               "aoe: error packet from ",
+                               get_unaligned_be16(&h->major),
+                               h->minor, skb->dev->name,
+                               h->err, aoe_errlist[n]);
                goto exit;
        }
 
@@ -160,7 +142,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt)
                aoecmd_cfg_rsp(skb);
                break;
        default:
-               printk(KERN_INFO "aoe: aoenet_rcv: unknown cmd %d\n", h->cmd);
+               printk(KERN_INFO "aoe: unknown cmd %d\n", h->cmd);
        }
 exit:
        dev_kfree_skb(skb);