diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-14 15:17:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-14 15:17:54 -0400 |
| commit | 7f83560df2b51d41fbc77c7b204b3f5c2ad6765a (patch) | |
| tree | b42dbeaa952ad4846c6f232fc1a8992be8664f5a /drivers/net/ethernet/intel/e1000e/mac.c | |
| parent | 87b6d218f3adb00e6b58c7f96f8b5a74ff91abb4 (diff) | |
| parent | 8f56e4b9ab72109c5bf6d3e32ff43321a3ba4386 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/mac.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c index decad98c1059..d8327499305f 100644 --- a/drivers/net/ethernet/intel/e1000e/mac.c +++ b/drivers/net/ethernet/intel/e1000e/mac.c @@ -681,7 +681,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw) return ret_val; } - if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0) + if (!(nvm_data & NVM_WORD0F_PAUSE_MASK)) hw->fc.requested_mode = e1000_fc_none; else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == NVM_WORD0F_ASM_DIR) hw->fc.requested_mode = e1000_fc_tx_pause; |