diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-09-28 08:06:57 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-09-28 08:06:57 +0200 |
commit | 6afc0c269c3d20cde05515b00ede00e91fee0be5 (patch) | |
tree | d54e7fa59df16bb62902129dfd28956d9ae1be19 /include/linux/netdevice.h | |
parent | 968d712a2565121b269e1037a1517916a9769423 (diff) | |
parent | 097f70b3c4d84ffccca15195bdfde3a37c0a7c0f (diff) |
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 88a00694eda5..2d15e3831440 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -507,6 +507,7 @@ static inline void napi_enable(struct napi_struct *n) BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state)); smp_mb__before_atomic(); clear_bit(NAPI_STATE_SCHED, &n->state); + clear_bit(NAPI_STATE_NPSVC, &n->state); } #ifdef CONFIG_SMP |