diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-04 16:35:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-04 16:35:14 -0800 |
| commit | 901e03ef496173ea253c09db0500c63143adcb4b (patch) | |
| tree | f0c04b78637fadce9886438aa67a4a41b642f7ed /include | |
| parent | 94f5af8b9da009017a2051f0504b3aad494c500c (diff) | |
| parent | 88968e1d86cf4e3191932806908c357fdce1db68 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 372d30d0cd55..ddfd7b3b1c75 100644 --- 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); |