From ae65d876b7e7b211ee13753c3801268ca1b99be0 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 3 Jul 2006 00:25:26 -0700 Subject: [PATCH] --- yaml --- r: 31839 b: refs/heads/master c: 91ebe2a9320db7195d1e25152b5d158fc66dc133 h: refs/heads/master i: 31837: e63df0e3eb33ee1b3def9add3899448e86a8336a 31835: 9b73f218fa0521c77b70fe397f2d5ba5be184c85 31831: 1d0c2dde8ef659e18c50967821f5d630420564be 31823: b86668ece16df4bdc2342c5c93257c97454aa7c4 31807: 751c8fe3e201192bd7ade00fba0d6d8be5394a8d v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7e94aa07a0c9..c6270d332f14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60be6b9a41cb0da0df7a9f11486da56baebf04cd +refs/heads/master: 91ebe2a9320db7195d1e25152b5d158fc66dc133 diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c index 36733b9823c6..8e8963f15731 100644 --- a/trunk/drivers/s390/net/qeth_main.c +++ b/trunk/drivers/s390/net/qeth_main.c @@ -84,6 +84,8 @@ static debug_info_t *qeth_dbf_qerr = NULL; DEFINE_PER_CPU(char[256], qeth_dbf_txt_buf); +static struct lock_class_key qdio_out_skb_queue_key; + /** * some more definitions and declarations */ @@ -3229,6 +3231,9 @@ qeth_alloc_qdio_buffers(struct qeth_card *card) &card->qdio.out_qs[i]->qdio_bufs[j]; skb_queue_head_init(&card->qdio.out_qs[i]->bufs[j]. skb_list); + lockdep_set_class( + &card->qdio.out_qs[i]->bufs[j].skb_list.lock, + &qdio_out_skb_queue_key); INIT_LIST_HEAD(&card->qdio.out_qs[i]->bufs[j].ctx_list); } } @@ -5272,6 +5277,7 @@ qeth_free_vlan_buffer(struct qeth_card *card, struct qeth_qdio_out_buffer *buf, struct sk_buff_head tmp_list; skb_queue_head_init(&tmp_list); + lockdep_set_class(&tmp_list.lock, &qdio_out_skb_queue_key); for(i = 0; i < QETH_MAX_BUFFER_ELEMENTS(card); ++i){ while ((skb = skb_dequeue(&buf->skb_list))){ if (vlan_tx_tag_present(skb) &&