From 8f15008b6c12e5182ea7aaf6a7e68ecbd85cc5c0 Mon Sep 17 00:00:00 2001 From: John Fastabend Date: Wed, 19 Sep 2012 21:35:57 +0000 Subject: [PATCH] --- yaml --- r: 328027 b: refs/heads/master c: 012dc19a45b2b9cc2ebd14aaa401cf782c2abba4 h: refs/heads/master i: 328025: 58cc694796da162d3b3660a7fe22b4cb6469d133 328023: b939fd26c8d690dd5c4a94389e9b37fb76d6f0d6 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbevf/vf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index deed6dd262a4..f05b836c8c6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31186785186415eaf2b66025969d2364a07c9e83 +refs/heads/master: 012dc19a45b2b9cc2ebd14aaa401cf782c2abba4 diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/vf.c b/trunk/drivers/net/ethernet/intel/ixgbevf/vf.c index 690801bd15b0..87b3f3bf1c1f 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/trunk/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -100,7 +100,7 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw) msgbuf[0] = IXGBE_VF_RESET; mbx->ops.write_posted(hw, msgbuf, 1); - msleep(10); + mdelay(10); /* set our "perm_addr" based on info provided by PF */ /* also set up the mc_filter_type which is piggy backed