[BLOCK] Get rid of request_queue_t typedef

[deliverable/linux.git] / drivers / block / aoe / aoe.h

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 2308e83e5f33aff25297a2ef7ad3363a56a645ef..ba07f762c4cbf23cabedb7b0feb4903483d213f9 100644 (file)
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -48,6 +48,15 @@ struct aoe_hdr {
        __be32 tag;
 };
 
+#ifdef __KERNEL__
+#include <linux/skbuff.h>
+
+static inline struct aoe_hdr *aoe_hdr(const struct sk_buff *skb)
+{
+       return (struct aoe_hdr *)skb_mac_header(skb);
+}
+#endif
+
 struct aoe_atahdr {
        unsigned char aflags;
        unsigned char errfeat;
@@ -129,7 +138,7 @@ struct aoedev {
        u16 maxbcnt;
        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;