diff options
| -rw-r--r-- | patches/localversion.patch | 2 | ||||
| -rw-r--r-- | patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/patches/localversion.patch b/patches/localversion.patch index bba4391fd1bd..1b76c9e42e6f 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt21 ++-rt22 diff --git a/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch b/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch index 136412182c42..b79ae04b1d93 100644 --- a/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch +++ b/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch @@ -46,12 +46,12 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c -@@ -930,7 +930,7 @@ void dev_deactivate_many(struct list_hea +@@ -933,7 +933,7 @@ void dev_deactivate_many(struct list_hea /* Wait for outstanding qdisc_run calls. */ - list_for_each_entry(dev, head, close_list) + list_for_each_entry(dev, head, close_list) { while (some_qdisc_is_busy(dev)) - yield(); + msleep(1); - } - - void dev_deactivate(struct net_device *dev) + /* The new qdisc is assigned at this point so we can safely + * unwind stale skb lists and qdisc statistics + */ |