diff options
Diffstat (limited to 'drivers/infiniband/hw/nes')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_cm.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index cfa3a2b22232..33c7eedaba6c 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c | |||
@@ -1397,7 +1397,7 @@ static void handle_fin_pkt(struct nes_cm_node *cm_node) | |||
1397 | cleanup_retrans_entry(cm_node); | 1397 | cleanup_retrans_entry(cm_node); |
1398 | cm_node->state = NES_CM_STATE_CLOSING; | 1398 | cm_node->state = NES_CM_STATE_CLOSING; |
1399 | send_ack(cm_node, NULL); | 1399 | send_ack(cm_node, NULL); |
1400 | /* Wait for ACK as this is simultanous close.. | 1400 | /* Wait for ACK as this is simultaneous close.. |
1401 | * After we receive ACK, do not send anything.. | 1401 | * After we receive ACK, do not send anything.. |
1402 | * Just rm the node.. Done.. */ | 1402 | * Just rm the node.. Done.. */ |
1403 | break; | 1403 | break; |
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 08c194861af5..10d0a5ec9add 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
@@ -80,7 +80,7 @@ static void nes_terminate_start_timer(struct nes_qp *nesqp); | |||
80 | 80 | ||
81 | #ifdef CONFIG_INFINIBAND_NES_DEBUG | 81 | #ifdef CONFIG_INFINIBAND_NES_DEBUG |
82 | static unsigned char *nes_iwarp_state_str[] = { | 82 | static unsigned char *nes_iwarp_state_str[] = { |
83 | "Non-Existant", | 83 | "Non-Existent", |
84 | "Idle", | 84 | "Idle", |
85 | "RTS", | 85 | "RTS", |
86 | "Closing", | 86 | "Closing", |
@@ -91,7 +91,7 @@ static unsigned char *nes_iwarp_state_str[] = { | |||
91 | }; | 91 | }; |
92 | 92 | ||
93 | static unsigned char *nes_tcp_state_str[] = { | 93 | static unsigned char *nes_tcp_state_str[] = { |
94 | "Non-Existant", | 94 | "Non-Existent", |
95 | "Closed", | 95 | "Closed", |
96 | "Listen", | 96 | "Listen", |
97 | "SYN Sent", | 97 | "SYN Sent", |
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 2c9c1933bbe3..e96b8fb5d44c 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
@@ -902,7 +902,7 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev) | |||
902 | nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active); | 902 | nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active); |
903 | } | 903 | } |
904 | 904 | ||
905 | nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscous = %d, All Multicast = %d.\n", | 905 | nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscuous = %d, All Multicast = %d.\n", |
906 | mc_count, !!(netdev->flags & IFF_PROMISC), | 906 | mc_count, !!(netdev->flags & IFF_PROMISC), |
907 | !!(netdev->flags & IFF_ALLMULTI)); | 907 | !!(netdev->flags & IFF_ALLMULTI)); |
908 | if (!mc_all_on) { | 908 | if (!mc_all_on) { |