From f0c2e88f5728ccba86367e366b919f90d3c90527 Mon Sep 17 00:00:00 2001 From: Tatyana Nikolova Date: Tue, 2 Oct 2012 16:38:12 +0000 Subject: [PATCH] --- yaml --- r: 330467 b: refs/heads/master c: d5fb476a10a9de56fb518886619ae9a6bf7c7efd h: refs/heads/master i: 330465: 9f5cec33fa1763733a8ab96a047d2aa4d4dd3431 330463: 48926224611dbfc57856ef976e2b39f7a74b3a37 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_verbs.c | 1 + trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cfa5774f6ab1..0f76a0d2693b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60396683fe863b3bc3ec22e9243dc2e76de601dd +refs/heads/master: d5fb476a10a9de56fb518886619ae9a6bf7c7efd diff --git a/trunk/drivers/infiniband/hw/nes/nes_verbs.c b/trunk/drivers/infiniband/hw/nes/nes_verbs.c index 1dadcf388c02..9eb54b7794fb 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_verbs.c +++ b/trunk/drivers/infiniband/hw/nes/nes_verbs.c @@ -3006,6 +3006,7 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, switch (nesqp->hw_iwarp_state) { case NES_AEQE_IWARP_STATE_CLOSING: next_iwarp_state = NES_CQP_QP_IWARP_STATE_CLOSING; + break; case NES_AEQE_IWARP_STATE_TERMINATE: next_iwarp_state = NES_CQP_QP_IWARP_STATE_TERMINATE; break; diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index 926c911c0ac4..ba6506ff4abb 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -3094,8 +3094,6 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave, if (validate_eth_header_mac(slave, rule_header, rlist)) return -EINVAL; break; - case MLX4_NET_TRANS_RULE_ID_IB: - break; case MLX4_NET_TRANS_RULE_ID_IPV4: case MLX4_NET_TRANS_RULE_ID_TCP: case MLX4_NET_TRANS_RULE_ID_UDP: