summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2010-11-29 18:18:49 +0100
committerMichael Brown2010-11-29 18:18:49 +0100
commitb8f721123ba83c1c9c70b17c269687382a19ecb0 (patch)
tree51c1adcc24e3647cf3ddf3fd4b39643a9b2473ea
parent[script] Remove "Aborting on <line>" message (diff)
downloadipxe-b8f721123ba83c1c9c70b17c269687382a19ecb0.tar.gz
ipxe-b8f721123ba83c1c9c70b17c269687382a19ecb0.tar.xz
ipxe-b8f721123ba83c1c9c70b17c269687382a19ecb0.zip
[hermon] Fix inconsistent information in HERMON_SET_PORT_GENERAL_PARAM
pptx and pfctx should not be set together, nor should pprx and pfcrx. Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/drivers/infiniband/hermon.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/drivers/infiniband/hermon.c b/src/drivers/infiniband/hermon.c
index 91c74550..65b148cc 100644
--- a/src/drivers/infiniband/hermon.c
+++ b/src/drivers/infiniband/hermon.c
@@ -2369,12 +2369,10 @@ static int hermon_eth_open ( struct net_device *netdev ) {
v_pptx, 1 );
MLX_FILL_1 ( &set_port.general, 1,
mtu, ( ETH_FRAME_LEN + 40 /* Used by card */ ) );
- MLX_FILL_2 ( &set_port.general, 2,
- pfctx, ( 1 << FCOE_VLAN_PRIORITY ),
- pptx, 1 );
- MLX_FILL_2 ( &set_port.general, 3,
- pfcrx, ( 1 << FCOE_VLAN_PRIORITY ),
- pprx, 1 );
+ MLX_FILL_1 ( &set_port.general, 2,
+ pfctx, ( 1 << FCOE_VLAN_PRIORITY ) );
+ MLX_FILL_1 ( &set_port.general, 3,
+ pfcrx, ( 1 << FCOE_VLAN_PRIORITY ) );
if ( ( rc = hermon_cmd_set_port ( hermon, 1,
( HERMON_SET_PORT_GENERAL_PARAM |
ibdev->port ),