The patch titled workstruct: fix ieee80211-softmac compile problem has been added to the -mm tree. Its filename is workstruct-fix-ieee80211-softmac-compile-problem.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: workstruct: fix ieee80211-softmac compile problem From: David Howells <dhowells@xxxxxxxxxx> Fix ieee80211-softmac compile problem where it's using schedule_work() on a delayed_work struct. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Cc: "John W. Linville" <linville@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- net/ieee80211/softmac/ieee80211softmac_assoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN net/ieee80211/softmac/ieee80211softmac_assoc.c~workstruct-fix-ieee80211-softmac-compile-problem net/ieee80211/softmac/ieee80211softmac_assoc.c --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c~workstruct-fix-ieee80211-softmac-compile-problem +++ a/net/ieee80211/softmac/ieee80211softmac_assoc.c @@ -438,7 +438,7 @@ ieee80211softmac_try_reassoc(struct ieee spin_lock_irqsave(&mac->lock, flags); mac->associnfo.associating = 1; - schedule_work(&mac->associnfo.work); + schedule_delayed_work(&mac->associnfo.work, 0); spin_unlock_irqrestore(&mac->lock, flags); } _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are origin.patch workstruct-fix-ieee80211-softmac-compile-problem.patch alsa-workqueue-fixes.patch nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch git-s390.patch doc-atomic_add_unless-doesnt-imply-mb-on-failure.patch ecryptfs-public-key-transport-mechanism.patch ecryptfs-public-key-packet-management.patch workstruct-implement-generic-up-cmpxchg-where-an-arch-doesnt-support-it.patch workqueue-tweaks.patch workqueue-dont-hold-workqueue_mutex-in-flush_scheduled_work.patch reiser4-get_sb_dev-fix.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html