__cancel_delayed_work is needed by include/net/bluetooth/l2cap.h and
not available in old kernel versions. This was just copied from the
kernel.
This should also go into compat-wireless-stable-3.3.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
include/linux/compat-2.6.31.h | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/include/linux/compat-2.6.31.h b/include/linux/compat-2.6.31.h
index 25db973..a1244cb 100644
--- a/include/linux/compat-2.6.31.h
+++ b/include/linux/compat-2.6.31.h
@@ -215,6 +215,20 @@ extern long long atomic64_add_return(long long a, atomic64_t *v);
#endif
+/*
+ * Like above, but uses del_timer() instead of del_timer_sync(). This means,
+ * if it returns 0 the timer function may be running and the queueing is in
+ * progress.
+ */
+static inline bool __cancel_delayed_work(struct delayed_work *work)
+{
+ bool ret;
+
+ ret = del_timer(&work->timer);
+ if (ret)
+ work_clear_pending(&work->work);
+ return ret;
+}
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) */
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
