Skip to content

L
linux
Commit 901e03ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 94f5af8b 88968e1d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/linux/skbuff.h
View file @ 901e03ef
...@@ -589,7 +589,7 @@ static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list) ...@@ -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) static inline struct sk_buff *skb_dequeue(struct sk_buff_head *list)
{ {
long flags; unsigned long flags;
struct sk_buff *result; struct sk_buff *result;
spin_lock_irqsave(&list->lock, flags); spin_lock_irqsave(&list->lock, flags);
...@@ -738,7 +738,7 @@ static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list) ...@@ -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) static inline struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list)
{ {
long flags; unsigned long flags;
struct sk_buff *result; struct sk_buff *result;
spin_lock_irqsave(&list->lock, flags); spin_lock_irqsave(&list->lock, flags);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7