diff options
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_hw.c')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 7c0ff19ce382..055f4b545df0 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
@@ -1529,7 +1529,7 @@ int nes_init_phy(struct nes_device *nesdev) | |||
1529 | } else { | 1529 | } else { |
1530 | /* setup 10G MDIO operation */ | 1530 | /* setup 10G MDIO operation */ |
1531 | tx_config &= 0xFFFFFFE3; | 1531 | tx_config &= 0xFFFFFFE3; |
1532 | tx_config |= 0x15; | 1532 | tx_config |= 0x1D; |
1533 | } | 1533 | } |
1534 | nes_write_indexed(nesdev, NES_IDX_MAC_TX_CONFIG, tx_config); | 1534 | nes_write_indexed(nesdev, NES_IDX_MAC_TX_CONFIG, tx_config); |
1535 | 1535 | ||
@@ -3619,10 +3619,6 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev, | |||
3619 | } | 3619 | } |
3620 | break; | 3620 | break; |
3621 | case NES_AEQE_AEID_LLP_CLOSE_COMPLETE: | 3621 | case NES_AEQE_AEID_LLP_CLOSE_COMPLETE: |
3622 | if (nesqp->term_flags) { | ||
3623 | nes_terminate_done(nesqp, 0); | ||
3624 | return; | ||
3625 | } | ||
3626 | spin_lock_irqsave(&nesqp->lock, flags); | 3622 | spin_lock_irqsave(&nesqp->lock, flags); |
3627 | nesqp->hw_iwarp_state = iwarp_state; | 3623 | nesqp->hw_iwarp_state = iwarp_state; |
3628 | nesqp->hw_tcp_state = tcp_state; | 3624 | nesqp->hw_tcp_state = tcp_state; |