commit | 7f6618226360b4aa0230a49525c81bf47d1d53c8 | [log] [tgz] |
---|---|---|
author | Alice Michael <alice.michael@intel.com> | Tue Aug 29 05:32:36 2017 -0400 |
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | Fri Oct 06 08:11:31 2017 -0700 |
tree | cd6adb7d6bf830ec203bbf06b5ed696c86431d6a | |
parent | bd6cd4e6dd38a35215d3f28f12db51213c9aead6 [diff] |
i40e: fix merge error This patch removes some code that was accidentally added to the wrong function with a merge error. Fixes: c53934c6d1b1 ("i40e: fix: do not sleep in netdev_ops") Signed-off-by: Alice Michael <alice.michael@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>