Merge master.kernel.org:/home/davem/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
901e03ef · Linus Torvalds · 94f5af8b · 88968e1d · 901e03ef
Commit 901e03ef authored Apr 04, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

include/linux/skbuff.h include/linux/skbuff.h +2 -2

No files found.
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -589,7 +589,7 @@ static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list)

 static inline struct sk_buff *skb_dequeue(struct sk_buff_head *list)
 {
-	long flags;
+	unsigned long flags;
 	struct sk_buff *result;

 	spin_lock_irqsave(&list->lock, flags);
@@ -738,7 +738,7 @@ static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list)

 static inline struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list)
 {
-	long flags;
+	unsigned long flags;
 	struct sk_buff *result;

 	spin_lock_irqsave(&list->lock, flags);