diff options
| -rw-r--r-- | include/linux/skbuff.h | 3 | ||||
| -rw-r--r-- | net/core/skbuff.c | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 57d7d4965f9a..3597b4f14389 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -604,9 +604,12 @@ static inline __u32 skb_queue_len(const struct sk_buff_head *list_) | |||
| 604 | return list_->qlen; | 604 | return list_->qlen; |
| 605 | } | 605 | } |
| 606 | 606 | ||
| 607 | extern struct lock_class_key skb_queue_lock_key; | ||
| 608 | |||
| 607 | static inline void skb_queue_head_init(struct sk_buff_head *list) | 609 | static inline void skb_queue_head_init(struct sk_buff_head *list) |
| 608 | { | 610 | { |
| 609 | spin_lock_init(&list->lock); | 611 | spin_lock_init(&list->lock); |
| 612 | lockdep_set_class(&list->lock, &skb_queue_lock_key); | ||
| 610 | list->prev = list->next = (struct sk_buff *)list; | 613 | list->prev = list->next = (struct sk_buff *)list; |
| 611 | list->qlen = 0; | 614 | list->qlen = 0; |
| 612 | } | 615 | } |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7cfbdb215ba2..44f6a181a754 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -71,6 +71,13 @@ static kmem_cache_t *skbuff_head_cache __read_mostly; | |||
| 71 | static kmem_cache_t *skbuff_fclone_cache __read_mostly; | 71 | static kmem_cache_t *skbuff_fclone_cache __read_mostly; |
| 72 | 72 | ||
| 73 | /* | 73 | /* |
| 74 | * lockdep: lock class key used by skb_queue_head_init(): | ||
| 75 | */ | ||
| 76 | struct lock_class_key skb_queue_lock_key; | ||
| 77 | |||
| 78 | EXPORT_SYMBOL(skb_queue_lock_key); | ||
| 79 | |||
| 80 | /* | ||
| 74 | * Keep out-of-line to prevent kernel bloat. | 81 | * Keep out-of-line to prevent kernel bloat. |
| 75 | * __builtin_return_address is not used because it is not always | 82 | * __builtin_return_address is not used because it is not always |
| 76 | * reliable. | 83 | * reliable. |
