提交 affa9dfb 编写于 作者: C Carolyn Wyborny 提交者: David S. Miller

e1000e: Add check for reset flags before displaying reset message

Some parts need to execute resets during normal operation.  This flag
check ensures that those parts reset without needlessly alarming the
user.  Other unexpected resets by other parts will dump debug info
and message the reset action to the user, as originally intended.
Signed-off-by: NCarolyn Wyborny <carolyn.wyborny@intel.com>
Acked-by: NBruce Allan <bruce.w.allan@intel.com>
Tested-by: NEmil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 ff10e13c
...@@ -4882,8 +4882,11 @@ static void e1000_reset_task(struct work_struct *work) ...@@ -4882,8 +4882,11 @@ static void e1000_reset_task(struct work_struct *work)
struct e1000_adapter *adapter; struct e1000_adapter *adapter;
adapter = container_of(work, struct e1000_adapter, reset_task); adapter = container_of(work, struct e1000_adapter, reset_task);
e1000e_dump(adapter); if (!((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
e_err("Reset adapter\n"); (adapter->flags & FLAG_RX_RESTART_NOW))) {
e1000e_dump(adapter);
e_err("Reset adapter\n");
}
e1000e_reinit_locked(adapter); e1000e_reinit_locked(adapter);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册