diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-10-27 11:31:44 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-10-27 11:31:44 +0300 |
commit | 6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch) | |
tree | c2f9e364889fa07e20081b198a085a4ed7b26bd3 /net/ncsi/ncsi-aen.c | |
parent | 57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff) | |
parent | 2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff) | |
download | linux-6856b8e53609ee3eff7e3173e4e5d979f47d834d.tar.xz |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ncsi/ncsi-aen.c')
-rw-r--r-- | net/ncsi/ncsi-aen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ncsi/ncsi-aen.c b/net/ncsi/ncsi-aen.c index 6898e7229285..f135938bf781 100644 --- a/net/ncsi/ncsi-aen.c +++ b/net/ncsi/ncsi-aen.c @@ -187,7 +187,7 @@ static struct ncsi_aen_handler { } ncsi_aen_handlers[] = { { NCSI_PKT_AEN_LSC, 12, ncsi_aen_handler_lsc }, { NCSI_PKT_AEN_CR, 4, ncsi_aen_handler_cr }, - { NCSI_PKT_AEN_HNCDSC, 4, ncsi_aen_handler_hncdsc } + { NCSI_PKT_AEN_HNCDSC, 8, ncsi_aen_handler_hncdsc } }; int ncsi_aen_handler(struct ncsi_dev_priv *ndp, struct sk_buff *skb) |