Skip to contentSkip to conversation

connector: fix compilation breakage introduced recently.

PATCH Applied Evgeniy Polyakov 2 participants 3 messages Dec 17, 2006 – Dec 18, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 connector: fix compilation breakage introduced recently.

Linus has changed work queue structure and has not tested it with connector compiled in, his changes break the build.

Attached patch fixes compilation error.

Patch is against commit 99f5e9718185f07458ae70c2282c2153a2256c91.

Thanks to Toralf Förster for pointing this out.

drivers/connector/connector.c +1 -2
index 5e7cd45..4cec1a8 100644
@@ -135,8 +135,7 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
 	spin_lock_bh(&dev->cbdev->queue_lock);
 	list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) {
 		if (cn_cb_equal(&__cbq->id.id, &msg->id)) {
-			if (likely(!test_bit(WORK_STRUCT_PENDING,
-					     &__cbq->work.work.management) &&
+			if (likely(!work_pending(&__cbq->work.work) &&
 					__cbq->data.ddata == NULL)) {
 				__cbq->data.callback_priv = msg;
 
Signature · 1 line
	Evgeniy Polyakov
maintainer Applied
#1 lore raw

From: Evgeniy Polyakov <[email protected]>
Date: Sun, 17 Dec 2006 14:29:46 +0300

Quoted 10 lines

Linus has changed work queue structure and has not tested it with connector compiled in, his changes break the build.

Attached patch fixes compilation error.

Patch is against commit 99f5e9718185f07458ae70c2282c2153a2256c91.

Thanks to Toralf Förster for pointing this out.

Applied, thanks Evgeniy.

#2 lore raw
Quoted 8 lines · David Miller

From: Evgeniy Polyakov <[email protected]>
Date: Sun, 17 Dec 2006 14:29:46 +0300

Quoted 5 lines

Linus has changed work queue structure and has not tested it with connector compiled in, his changes break the build.

Attached patch fixes compilation error.

Quoted 7 lines
Quoted 5 lines

Patch is against commit 99f5e9718185f07458ae70c2282c2153a2256c91.

Thanks to Toralf Förster for pointing this out.

Applied, thanks Evgeniy.

Thanks.
I will send a patch on top of this to replace delayed work with usual work queue today.

Signature · 1 line
	Evgeniy Polyakov