Fix compilation on 2.6.28

Reported-by: Sticky__ via IRC #linux-wireless
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
index 5d84168a9d63bd665a8897ee4b90337b76c19bbb..cb956b74157ec50c86a33ccaa7446596c18e4051 100644 (file)
--- a/compat/compat-2.6.28.h
+++ b/compat/compat-2.6.28.h
@@ -30,6 +30,36 @@
 
 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
 
+/**
+ *     skb_queue_is_last - check if skb is the last entry in the queue
+ *     @list: queue head
+ *     @skb: buffer
+ *
+ *     Returns true if @skb is the last buffer on the list.
+ */
+static inline bool skb_queue_is_last(const struct sk_buff_head *list,
+                                    const struct sk_buff *skb)
+{
+       return (skb->next == (struct sk_buff *) list);
+}
+
+/**
+ *     skb_queue_next - return the next packet in the queue
+ *     @list: queue head
+ *     @skb: current buffer
+ *
+ *     Return the next packet in @list after @skb.  It is only valid to
+ *     call this if skb_queue_is_last() evaluates to false.
+ */
+static inline struct sk_buff *skb_queue_next(const struct sk_buff_head *list,
+                                             const struct sk_buff *skb)
+{
+       /* This BUG_ON may seem severe, but if we just return then we
+        * are going to dereference garbage.
+        */
+       BUG_ON(skb_queue_is_last(list, skb));
+       return skb->next;
+}
 
 /**
  *     __skb_queue_head_init - initialize non-spinlock portions of sk_buff_head

diff --git a/compat/compat-2.6.29.h b/compat/compat-2.6.29.h
index 6fa4654d5c291abcbcf83fb76f4af63a2d4cf288..f4086e92e6a9d6b6eda2d3c9641b010413745ffa 100644 (file)
--- a/compat/compat-2.6.29.h
+++ b/compat/compat-2.6.29.h
@@ -40,37 +40,6 @@ static inline struct sk_buff *skb_queue_prev(const struct sk_buff_head *list,
        return skb->prev;
 }
 
-/**
- *     skb_queue_is_last - check if skb is the last entry in the queue
- *     @list: queue head
- *     @skb: buffer
- *
- *     Returns true if @skb is the last buffer on the list.
- */
-static inline bool skb_queue_is_last(const struct sk_buff_head *list,
-                                    const struct sk_buff *skb)
-{
-       return (skb->next == (struct sk_buff *) list);
-}
-
-/**
- *     skb_queue_next - return the next packet in the queue
- *     @list: queue head
- *     @skb: current buffer
- *
- *     Return the next packet in @list after @skb.  It is only valid to
- *     call this if skb_queue_is_last() evaluates to false.
- */
-static inline struct sk_buff *skb_queue_next(const struct sk_buff_head *list,
-                                             const struct sk_buff *skb)
-{
-       /* This BUG_ON may seem severe, but if we just return then we
-        * are going to dereference garbage.
-        */
-       BUG_ON(skb_queue_is_last(list, skb));
-       return skb->next;
-}
-
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) */
 
 #endif /*  LINUX_26_29_COMPAT_H */