if_ntb: Correct over-long lines, use qmin()

Sponsored by:	EMC / Isilon Storage Division

diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c
index 8c7a424b30a272a6801eeecfdeaaa0e20e351a9d..40806ea96443cb3f93f55d6a53aa0aed7735d96c 100644 (file)
--- a/sys/dev/ntb/if_ntb/if_ntb.c
+++ b/sys/dev/ntb/if_ntb/if_ntb.c
@@ -673,8 +673,8 @@ ntb_transport_init_queue(struct ntb_transport_ctx *nt, unsigned int qp_num)
        qp->rx_info = (void *)((char *)qp->tx_mw + tx_size);
 
        /* Due to house-keeping, there must be at least 2 buffs */
-       qp->tx_max_frame = min(transport_mtu + sizeof(struct ntb_payload_header),
-           tx_size / 2);
+       qp->tx_max_frame = qmin(tx_size / 2,
+           transport_mtu + sizeof(struct ntb_payload_header));
        qp->tx_max_entry = tx_size / qp->tx_max_frame;
 
        callout_init(&qp->link_work, 0);
@@ -1356,8 +1356,8 @@ ntb_transport_setup_qp_mw(struct ntb_transport_ctx *nt, unsigned int qp_num)
        qp->remote_rx_info = (void*)((char *)qp->rx_buff + rx_size);
 
        /* Due to house-keeping, there must be at least 2 buffs */
-       qp->rx_max_frame = min(transport_mtu + sizeof(struct ntb_payload_header),
-           rx_size / 2);
+       qp->rx_max_frame = qmin(rx_size / 2,
+           transport_mtu + sizeof(struct ntb_payload_header));
        qp->rx_max_entry = rx_size / qp->rx_max_frame;
        qp->rx_index = 0;