aoe: remove private mac address format function

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

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 599951d..c237527 100644 (file)
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "10"
+/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+#define VERSION "47"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"
 
@@ -65,7 +65,7 @@ struct aoe_atahdr {
 struct aoe_cfghdr {
        __be16 bufcnt;
        __be16 fwver;
-       unsigned char res;
+       unsigned char scnt;
        unsigned char aoeccmd;
        unsigned char cslen[2];
 };
@@ -75,27 +75,36 @@ enum {
        DEVFL_TKILL = (1<<1),   /* flag for timer to know when to kill self */
        DEVFL_EXT = (1<<2),     /* device accepts lba48 commands */
        DEVFL_CLOSEWAIT = (1<<3), /* device is waiting for all closes to revalidate */
-       DEVFL_WC_UPDATE = (1<<4), /* this device needs to update write cache status */
-       DEVFL_WORKON = (1<<4),
+       DEVFL_GDALLOC = (1<<4), /* need to alloc gendisk */
+       DEVFL_KICKME = (1<<5),  /* slow polling network card catch */
+       DEVFL_NEWSIZE = (1<<6), /* need to update dev size in block layer */
 
        BUFFL_FAIL = 1,
 };
 
 enum {
-       MAXATADATA = 1024,
+       DEFAULTBCNT = 2 * 512,  /* 2 sectors */
        NPERSHELF = 16,         /* number of slots per shelf address */
        FREETAG = -1,
-       MIN_BUFS = 8,
+       MIN_BUFS = 16,
+       NTARGETS = 8,
+       NAOEIFS = 8,
+       NSKBPOOLMAX = 128,
+
+       TIMERTICK = HZ / 10,
+       MINTIMER = HZ >> 2,
+       MAXTIMER = HZ << 1,
+       HELPWAIT = 20,
 };
 
 struct buf {
        struct list_head bufs;
-       ulong start_time;       /* for disk stats */
+       ulong stime;    /* for disk stats */
        ulong flags;
        ulong nframesout;
-       char *bufaddr;
        ulong resid;
        ulong bv_resid;
+       ulong bv_off;
        sector_t sector;
        struct bio *bio;
        struct bio_vec *bv;
@@ -106,39 +115,58 @@ struct frame {
        ulong waited;
        struct buf *buf;
        char *bufaddr;
-       int writedatalen;
-       int ndata;
+       ulong bcnt;
+       sector_t lba;
+       struct sk_buff *skb;
+};
 
-       /* largest possible */
-       unsigned char data[sizeof(struct aoe_hdr) + sizeof(struct aoe_atahdr)];
+struct aoeif {
+       struct net_device *nd;
+       unsigned char lost;
+       unsigned char lostjumbo;
+       ushort maxbcnt;
+};
+
+struct aoetgt {
+       unsigned char addr[6];
+       ushort nframes;
+       struct frame *frames;
+       struct aoeif ifs[NAOEIFS];
+       struct aoeif *ifp;      /* current aoeif in use */
+       ushort nout;
+       ushort maxout;
+       u16 lasttag;            /* last tag sent */
+       u16 useme;
+       ulong lastwadj;         /* last window adjustment */
+       int wpkts, rpkts;
+       int dataref;
 };
 
 struct aoedev {
        struct aoedev *next;
-       unsigned char addr[6];  /* remote mac addr */
-       ushort flags;
        ulong sysminor;
        ulong aoemajor;
-       ulong aoeminor;
-       ulong nopen;            /* (bd_openers isn't available without sleeping) */
-       ulong rttavg;           /* round trip average of requests/responses */
+       u16 aoeminor;
+       u16 flags;
+       u16 nopen;              /* (bd_openers isn't available without sleeping) */
+       u16 rttavg;             /* round trip average of requests/responses */
+       u16 mintimer;
        u16 fw_ver;             /* version of blade's firmware */
        struct work_struct work;/* disk create work struct */
        struct gendisk *gd;
-       request_queue_t blkq;
+       struct request_queue blkq;
        struct hd_geometry geo; 
        sector_t ssize;
        struct timer_list timer;
        spinlock_t lock;
-       struct net_device *ifp; /* interface ed is attached to */
-       struct sk_buff *sendq_hd; /* packets needing to be sent, list head */
-       struct sk_buff *sendq_tl;
+       struct sk_buff_head sendq;
+       struct sk_buff_head skbpool;
        mempool_t *bufpool;     /* for deadlock-free Buf allocation */
        struct list_head bufq;  /* queue of bios to work on */
        struct buf *inprocess;  /* the one we're currently working on */
-       ulong lasttag;          /* last tag sent */
-       ulong nframes;          /* number of frames below */
-       struct frame *frames;
+       struct aoetgt *targets[NTARGETS];
+       struct aoetgt **tgt;    /* target in use when working */
+       struct aoetgt **htgt;   /* target needing rexmit assistance */
 };
 
 
@@ -152,21 +180,23 @@ void aoechr_exit(void);
 void aoechr_error(char *);
 
 void aoecmd_work(struct aoedev *d);
-void aoecmd_cfg(ushort, unsigned char);
+void aoecmd_cfg(ushort aoemajor, unsigned char aoeminor);
 void aoecmd_ata_rsp(struct sk_buff *);
 void aoecmd_cfg_rsp(struct sk_buff *);
+void aoecmd_sleepwork(struct work_struct *);
+void aoecmd_cleanslate(struct aoedev *);
+struct sk_buff *aoecmd_ata_id(struct aoedev *);
 
 int aoedev_init(void);
 void aoedev_exit(void);
 struct aoedev *aoedev_by_aoeaddr(int maj, int min);
+struct aoedev *aoedev_by_sysminor_m(ulong sysminor);
 void aoedev_downdev(struct aoedev *d);
-struct aoedev *aoedev_set(ulong, unsigned char *, struct net_device *, ulong);
-int aoedev_busy(void);
+int aoedev_flush(const char __user *str, size_t size);
 
 int aoenet_init(void);
 void aoenet_exit(void);
-void aoenet_xmit(struct sk_buff *);
+void aoenet_xmit(struct sk_buff_head *);
 int is_aoe_netif(struct net_device *ifp);
 int set_aoe_iflist(const char __user *str, size_t size);
 
-u64 mac_addr(char addr[6]);