Commit 7495ab68 authored by Glenn Streiff's avatar Glenn Streiff Committed by Roland Dreier

RDMA/nes: Formatting cleanup

Various cleanups:
	- Change // to /* .. */
	- Place whitespace around binary operators.
	- Trim down a few long lines.
	- Some minor alignment formatting for better readability.
	- Remove some silly tabs.
Signed-off-by: default avatarGlenn Streiff <gstreiff@neteffect.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 0e1de5d6
...@@ -594,7 +594,7 @@ static void nes_cm_timer_tick(unsigned long pass) ...@@ -594,7 +594,7 @@ static void nes_cm_timer_tick(unsigned long pass)
continue; continue;
} }
/* this seems like the correct place, but leave send entry unprotected */ /* this seems like the correct place, but leave send entry unprotected */
// spin_unlock_irqrestore(&cm_node->retrans_list_lock, flags); /* spin_unlock_irqrestore(&cm_node->retrans_list_lock, flags); */
atomic_inc(&send_entry->skb->users); atomic_inc(&send_entry->skb->users);
cm_packets_retrans++; cm_packets_retrans++;
nes_debug(NES_DBG_CM, "Retransmitting send_entry %p for node %p," nes_debug(NES_DBG_CM, "Retransmitting send_entry %p for node %p,"
...@@ -1335,7 +1335,7 @@ static int process_packet(struct nes_cm_node *cm_node, struct sk_buff *skb, ...@@ -1335,7 +1335,7 @@ static int process_packet(struct nes_cm_node *cm_node, struct sk_buff *skb,
cm_node->loc_addr, cm_node->loc_port, cm_node->loc_addr, cm_node->loc_port,
cm_node->rem_addr, cm_node->rem_port, cm_node->rem_addr, cm_node->rem_port,
cm_node->state, atomic_read(&cm_node->ref_count)); cm_node->state, atomic_read(&cm_node->ref_count));
// create event /* create event */
cm_node->state = NES_CM_STATE_CLOSED; cm_node->state = NES_CM_STATE_CLOSED;
create_event(cm_node, NES_CM_EVENT_ABORTED); create_event(cm_node, NES_CM_EVENT_ABORTED);
...@@ -1669,7 +1669,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core, ...@@ -1669,7 +1669,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
if (!cm_node) if (!cm_node)
return NULL; return NULL;
// set our node side to client (active) side /* set our node side to client (active) side */
cm_node->tcp_cntxt.client = 1; cm_node->tcp_cntxt.client = 1;
cm_node->tcp_cntxt.rcv_wscale = NES_CM_DEFAULT_RCV_WND_SCALE; cm_node->tcp_cntxt.rcv_wscale = NES_CM_DEFAULT_RCV_WND_SCALE;
...@@ -1694,7 +1694,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core, ...@@ -1694,7 +1694,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
loopbackremotenode->mpa_frame_size = mpa_frame_size - loopbackremotenode->mpa_frame_size = mpa_frame_size -
sizeof(struct ietf_mpa_frame); sizeof(struct ietf_mpa_frame);
// we are done handling this state, set node to a TSA state /* we are done handling this state, set node to a TSA state */
cm_node->state = NES_CM_STATE_TSA; cm_node->state = NES_CM_STATE_TSA;
cm_node->tcp_cntxt.rcv_nxt = loopbackremotenode->tcp_cntxt.loc_seq_num; cm_node->tcp_cntxt.rcv_nxt = loopbackremotenode->tcp_cntxt.loc_seq_num;
loopbackremotenode->tcp_cntxt.rcv_nxt = cm_node->tcp_cntxt.loc_seq_num; loopbackremotenode->tcp_cntxt.rcv_nxt = cm_node->tcp_cntxt.loc_seq_num;
......
This diff is collapsed.
...@@ -969,7 +969,7 @@ struct nes_arp_entry { ...@@ -969,7 +969,7 @@ struct nes_arp_entry {
#define NES_NIC_CQ_DOWNWARD_TREND 16 #define NES_NIC_CQ_DOWNWARD_TREND 16
struct nes_hw_tune_timer { struct nes_hw_tune_timer {
//u16 cq_count; /* u16 cq_count; */
u16 threshold_low; u16 threshold_low;
u16 threshold_target; u16 threshold_target;
u16 threshold_high; u16 threshold_high;
......
...@@ -187,6 +187,7 @@ static int nes_netdev_open(struct net_device *netdev) ...@@ -187,6 +187,7 @@ static int nes_netdev_open(struct net_device *netdev)
macaddr_high = ((u16)netdev->dev_addr[0]) << 8; macaddr_high = ((u16)netdev->dev_addr[0]) << 8;
macaddr_high += (u16)netdev->dev_addr[1]; macaddr_high += (u16)netdev->dev_addr[1];
macaddr_low = ((u32)netdev->dev_addr[2]) << 24; macaddr_low = ((u32)netdev->dev_addr[2]) << 24;
macaddr_low += ((u32)netdev->dev_addr[3]) << 16; macaddr_low += ((u32)netdev->dev_addr[3]) << 16;
macaddr_low += ((u32)netdev->dev_addr[4]) << 8; macaddr_low += ((u32)netdev->dev_addr[4]) << 8;
...@@ -451,7 +452,7 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev) ...@@ -451,7 +452,7 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev)
__le16 *wqe_fragment_length; __le16 *wqe_fragment_length;
u32 nr_frags; u32 nr_frags;
u32 original_first_length; u32 original_first_length;
// u64 *wqe_fragment_address; /* u64 *wqe_fragment_address; */
/* first fragment (0) is used by copy buffer */ /* first fragment (0) is used by copy buffer */
u16 wqe_fragment_index=1; u16 wqe_fragment_index=1;
u16 hoffset; u16 hoffset;
...@@ -461,10 +462,11 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev) ...@@ -461,10 +462,11 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev)
u32 old_head; u32 old_head;
u32 wqe_misc; u32 wqe_misc;
/* nes_debug(NES_DBG_NIC_TX, "%s Request to tx NIC packet length %u, headlen %u," /*
" (%u frags), tso_size=%u\n", * nes_debug(NES_DBG_NIC_TX, "%s Request to tx NIC packet length %u, headlen %u,"
netdev->name, skb->len, skb_headlen(skb), * " (%u frags), tso_size=%u\n",
skb_shinfo(skb)->nr_frags, skb_is_gso(skb)); * netdev->name, skb->len, skb_headlen(skb),
* skb_shinfo(skb)->nr_frags, skb_is_gso(skb));
*/ */
if (!netif_carrier_ok(netdev)) if (!netif_carrier_ok(netdev))
...@@ -915,7 +917,7 @@ static int nes_netdev_change_mtu(struct net_device *netdev, int new_mtu) ...@@ -915,7 +917,7 @@ static int nes_netdev_change_mtu(struct net_device *netdev, int new_mtu)
struct nes_vnic *nesvnic = netdev_priv(netdev); struct nes_vnic *nesvnic = netdev_priv(netdev);
struct nes_device *nesdev = nesvnic->nesdev; struct nes_device *nesdev = nesvnic->nesdev;
int ret = 0; int ret = 0;
u8 jumbomode=0; u8 jumbomode = 0;
if ((new_mtu < ETH_ZLEN) || (new_mtu > max_mtu)) if ((new_mtu < ETH_ZLEN) || (new_mtu > max_mtu))
return -EINVAL; return -EINVAL;
...@@ -1438,7 +1440,7 @@ static int nes_netdev_set_settings(struct net_device *netdev, struct ethtool_cmd ...@@ -1438,7 +1440,7 @@ static int nes_netdev_set_settings(struct net_device *netdev, struct ethtool_cmd
/* Turn on Full duplex, Autoneg, and restart autonegotiation */ /* Turn on Full duplex, Autoneg, and restart autonegotiation */
phy_data |= 0x1300; phy_data |= 0x1300;
} else { } else {
// Turn off autoneg /* Turn off autoneg */
phy_data &= ~0x1000; phy_data &= ~0x1000;
} }
nes_write_1G_phy_reg(nesdev, 0, nesadapter->phy_index[nesdev->mac_index], nes_write_1G_phy_reg(nesdev, 0, nesadapter->phy_index[nesdev->mac_index],
......
...@@ -1266,7 +1266,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, ...@@ -1266,7 +1266,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
sq_size = init_attr->cap.max_send_wr; sq_size = init_attr->cap.max_send_wr;
rq_size = init_attr->cap.max_recv_wr; rq_size = init_attr->cap.max_recv_wr;
// check if the encoded sizes are OK or not... /* check if the encoded sizes are OK or not... */
sq_encoded_size = nes_get_encoded_size(&sq_size); sq_encoded_size = nes_get_encoded_size(&sq_size);
rq_encoded_size = nes_get_encoded_size(&rq_size); rq_encoded_size = nes_get_encoded_size(&rq_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment