Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31839
b: refs/heads/master
c: 91ebe2a
h: refs/heads/master
i:
  31837: e63df0e
  31835: 9b73f21
  31831: 1d0c2dd
  31823: b86668e
  31807: 751c8fe
v: v3
  • Loading branch information
Heiko Carstens authored and Linus Torvalds committed Jul 3, 2006
1 parent 6a3a646 commit ae65d87
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 60be6b9a41cb0da0df7a9f11486da56baebf04cd
refs/heads/master: 91ebe2a9320db7195d1e25152b5d158fc66dc133
6 changes: 6 additions & 0 deletions trunk/drivers/s390/net/qeth_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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) &&
Expand Down

0 comments on commit ae65d87

Please sign in to comment.