Removed more hacks, and adjusted number of queue entries for likely usage.

src/drivers/net/ipoib.c

@@ -41,10 +41,10 @@
 #define IPOIB_DATA_NUM_SEND_WQES 2
 
 /** Number of IPoIB data receive work queue entries */
-#define IPOIB_DATA_NUM_RECV_WQES 2
+#define IPOIB_DATA_NUM_RECV_WQES 4
 
 /** Number of IPoIB data completion entries */
-#define IPOIB_DATA_NUM_CQES 32
+#define IPOIB_DATA_NUM_CQES 8
 
 /** Number of IPoIB metadata send work queue entries */
 #define IPOIB_META_NUM_SEND_WQES 2
@@ -53,7 +53,7 @@
 #define IPOIB_META_NUM_RECV_WQES 2
 
 /** Number of IPoIB metadata completion entries */
-#define IPOIB_META_NUM_CQES 32
+#define IPOIB_META_NUM_CQES 8
 
 /** An IPoIB queue set */
 struct ipoib_queue_set {

src/drivers/net/mlx_ipoib/mt25218.c

@@ -30,11 +30,6 @@ Skeleton NIC driver for Etherboot
 #include "arbel.h"
 
 
-struct ib_address_vector hack_ipoib_bcast_av;
-
-
-
-
 
 
 
@@ -980,8 +975,6 @@ static int arbel_complete ( struct ib_device *ibdev,
 			 virt_to_bus ( iobuf->data ) );
 		assert ( MLX_GET ( &recv_wqe->data[0], byte_count ) ==
 			 iob_tailroom ( iobuf ) );
-		DBG ( "CPQ %lx QPN %lx WQE %x\n", cq->cqn, qp->qpn, wqe_idx );
-		//		DBG_HD ( iobuf, sizeof ( *iobuf ) );
 		MLX_FILL_1 ( &recv_wqe->data[0], 0, byte_count, 0 );
 		MLX_FILL_1 ( &recv_wqe->data[0], 1,
 			     l_key, ARBEL_INVALID_LKEY );
@@ -1368,18 +1361,6 @@ static int arbel_probe ( struct pci_device *pci,
 		goto err_get_pkey;
 	}
 
-	struct ud_av_st *bcast_av = ib_data.bcast_av;
-	struct arbelprm_ud_address_vector *bav =
-		( struct arbelprm_ud_address_vector * ) &bcast_av->av;
-	struct ib_address_vector *av = &hack_ipoib_bcast_av;
-	av->dest_qp = bcast_av->dest_qp;
-	av->qkey = bcast_av->qkey;
-	av->dlid = MLX_GET ( bav, rlid );
-	av->rate = ( MLX_GET ( bav, max_stat_rate ) ? 1 : 4 );
-	av->sl = MLX_GET ( bav, sl );
-	av->gid_present = 1;
-	memcpy ( &av->gid, ( ( void * ) bav ) + 16, 16 );
-
 	/* Add IPoIB device */
 	if ( ( rc = ipoib_probe ( ibdev ) ) != 0 ) {
 		DBGC ( arbel, "Arbel %p could not add IPoIB device: %s\n",