diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-06 22:29:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-06 22:29:20 -0500 |
| commit | 44d84d7272e5848878a96029b8a8b6e86854f146 (patch) | |
| tree | 91b188c0ae21255510ace7507d42cdf0e8f6f5ae /drivers/net/ethernet/intel/igb | |
| parent | de7b5b3d790a2524c3f992d357983600635c441b (diff) | |
| parent | bdec41963890f8ed9ad89f8b418959ab3cdc2aa3 (diff) | |
| download | blackbird-op-linux-44d84d7272e5848878a96029b8a8b6e86854f146.tar.gz blackbird-op-linux-44d84d7272e5848878a96029b8a8b6e86854f146.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/intel/igb')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_82575.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 051ea94bdcd3..0f69ef81751a 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -1125,7 +1125,7 @@ static s32 igb_acquire_swfw_sync_82575(struct e1000_hw *hw, u16 mask) u32 swmask = mask; u32 fwmask = mask << 16; s32 ret_val = 0; - s32 i = 0, timeout = 200; /* FIXME: find real value to use here */ + s32 i = 0, timeout = 200; while (i < timeout) { if (igb_get_hw_semaphore(hw)) { |
