diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/devlink.c | 6 | ||||
| -rw-r--r-- | net/rds/ib_cm.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 132f4b757963..5f0ca1216c70 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -1548,7 +1548,8 @@ static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink, u32 seq, int flags) { const struct devlink_ops *ops = devlink->ops; - u8 inline_mode, encap_mode; + enum devlink_eswitch_encap_mode encap_mode; + u8 inline_mode; void *hdr; int err = 0; u16 mode; @@ -1624,7 +1625,8 @@ static int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, { struct devlink *devlink = info->user_ptr[0]; const struct devlink_ops *ops = devlink->ops; - u8 inline_mode, encap_mode; + enum devlink_eswitch_encap_mode encap_mode; + u8 inline_mode; int err = 0; u16 mode; diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index 66c6eb56072b..5a42ebb892cd 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -611,11 +611,11 @@ send_hdrs_dma_out: qp_out: rdma_destroy_qp(ic->i_cm_id); recv_cq_out: - if (!ib_destroy_cq(ic->i_recv_cq)) - ic->i_recv_cq = NULL; + ib_destroy_cq(ic->i_recv_cq); + ic->i_recv_cq = NULL; send_cq_out: - if (!ib_destroy_cq(ic->i_send_cq)) - ic->i_send_cq = NULL; + ib_destroy_cq(ic->i_send_cq); + ic->i_send_cq = NULL; rds_ibdev_out: rds_ib_remove_conn(rds_ibdev, conn); out: |