Fix for adding timer when a timer is pending
Signed-off-by: Tatyana Nikolova <tatyana.e.nikol...@intel.com>
---
.../0025-RDMA-nes-Fix-for-adding-timer.patch | 23 ++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
create mode 100644 linux-next-pending/0025-RDMA-nes-Fix-for-adding-timer.patch
diff --git a/linux-next-pending/0025-RDMA-nes-Fix-for-adding-timer.patch
b/linux-next-pending/0025-RDMA-nes-Fix-for-adding-timer.patch
new file mode 100644
index 0000000..5154da2
--- /dev/null
+++ b/linux-next-pending/0025-RDMA-nes-Fix-for-adding-timer.patch
@@ -0,0 +1,23 @@
+Fix for kernel panic caused by adding a timer when a timer is already pending.
+
+Signed-off-by: Tatyana Nikolova <tatyana.e.nikol...@intel.com>
+---
+ drivers/infiniband/hw/nes/nes_cm.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/infiniband/hw/nes/nes_cm.c
b/drivers/infiniband/hw/nes/nes_cm.c
+index cfaacaf..c04bfca 100644
+--- a/drivers/infiniband/hw/nes/nes_cm.c
++++ b/drivers/infiniband/hw/nes/nes_cm.c
+@@ -727,7 +727,7 @@ int schedule_nes_timer(struct nes_cm_node *cm_node, struct
sk_buff *skb,
+
+ if (!was_timer_set) {
+ cm_core->tcp_timer.expires = new_send->timetosend;
+- add_timer(&cm_core->tcp_timer);
++ mod_timer(&cm_core->tcp_timer, cm_core->tcp_timer.expires);
+ }
+
+ return ret;
+--
+1.7.4.2
+
--
1.7.1
_______________________________________________
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
