- update to 2.6.1-rc2 -- first cut.

[linux-flexiantxendom0-3.2.10.git] / include / linux / skbuff.h

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index b7c23dd..77162e4 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -107,7 +107,7 @@ struct nf_bridge_info {
        struct net_device *netoutdev;
 #endif
        unsigned int mask;
-       unsigned long hh[32 / sizeof(unsigned long)];
+       unsigned long data[32 / sizeof(unsigned long)];
 };
 #endif
 
@@ -764,10 +764,10 @@ static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list)
 }
 
 /**
- *     skb_dequeue - remove from the head of the queue
+ *     skb_dequeue_tail - remove from the tail of the queue
  *     @list: list to dequeue from
  *
- *     Remove the head of the list. The list lock is taken so the function
+ *     Remove the tail of the list. The list lock is taken so the function
  *     may be used safely with other locking list functions. The tail item is
  *     returned or %NULL if the list is empty.
  */