summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0204-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0204-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch')
-rw-r--r--debian/patches-rt/0204-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/0204-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch b/debian/patches-rt/0204-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch
index f029d1482..dc8879fd7 100644
--- a/debian/patches-rt/0204-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch
+++ b/debian/patches-rt/0204-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch
@@ -1,8 +1,8 @@
From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 6 Dec 2016 17:50:30 -0500
-Subject: [PATCH 204/351] net: Have __napi_schedule_irqoff() disable interrupts
+Subject: [PATCH 204/353] net: Have __napi_schedule_irqoff() disable interrupts
on RT
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=ba1f28e1110d9c8ae7ddf71f24246835e166956e
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=885ccc3fa2dba0d75c963dff76a6dc343f36c3db
A customer hit a crash where the napi sd->poll_list became corrupted.
The customer had the bnx2x driver, which does a
@@ -28,10 +28,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
2 files changed, 14 insertions(+)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index dfec34087039..c4713217b20e 100644
+index 63a0574e2ac2..086cd650f555 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -423,7 +423,19 @@ typedef enum rx_handler_result rx_handler_result_t;
+@@ -425,7 +425,19 @@ typedef enum rx_handler_result rx_handler_result_t;
typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **pskb);
void __napi_schedule(struct napi_struct *n);
@@ -52,10 +52,10 @@ index dfec34087039..c4713217b20e 100644
static inline bool napi_disable_pending(struct napi_struct *n)
{
diff --git a/net/core/dev.c b/net/core/dev.c
-index 8e3cee96ce87..ad8f5563c85e 100644
+index f6443510a476..1103427c6942 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -5953,6 +5953,7 @@ bool napi_schedule_prep(struct napi_struct *n)
+@@ -5955,6 +5955,7 @@ bool napi_schedule_prep(struct napi_struct *n)
}
EXPORT_SYMBOL(napi_schedule_prep);
@@ -63,7 +63,7 @@ index 8e3cee96ce87..ad8f5563c85e 100644
/**
* __napi_schedule_irqoff - schedule for receive
* @n: entry to schedule
-@@ -5971,6 +5972,7 @@ void __napi_schedule_irqoff(struct napi_struct *n)
+@@ -5973,6 +5974,7 @@ void __napi_schedule_irqoff(struct napi_struct *n)
__napi_schedule(n);
}
EXPORT_SYMBOL(__napi_schedule_irqoff);