|
@@ -1193,10 +1193,7 @@ static int method_in_use(struct ib_mad_mgmt_method_table **method,
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- for (i = find_first_bit(mad_reg_req->method_mask, IB_MGMT_MAX_METHODS);
|
|
|
|
- i < IB_MGMT_MAX_METHODS;
|
|
|
|
- i = find_next_bit(mad_reg_req->method_mask, IB_MGMT_MAX_METHODS,
|
|
|
|
- 1+i)) {
|
|
|
|
|
|
+ for_each_set_bit(i, mad_reg_req->method_mask, IB_MGMT_MAX_METHODS) {
|
|
if ((*method)->agent[i]) {
|
|
if ((*method)->agent[i]) {
|
|
printk(KERN_ERR PFX "Method %d already in use\n", i);
|
|
printk(KERN_ERR PFX "Method %d already in use\n", i);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
@@ -1330,13 +1327,9 @@ static int add_nonoui_reg_req(struct ib_mad_reg_req *mad_reg_req,
|
|
goto error3;
|
|
goto error3;
|
|
|
|
|
|
/* Finally, add in methods being registered */
|
|
/* Finally, add in methods being registered */
|
|
- for (i = find_first_bit(mad_reg_req->method_mask,
|
|
|
|
- IB_MGMT_MAX_METHODS);
|
|
|
|
- i < IB_MGMT_MAX_METHODS;
|
|
|
|
- i = find_next_bit(mad_reg_req->method_mask, IB_MGMT_MAX_METHODS,
|
|
|
|
- 1+i)) {
|
|
|
|
|
|
+ for_each_set_bit(i, mad_reg_req->method_mask, IB_MGMT_MAX_METHODS)
|
|
(*method)->agent[i] = agent_priv;
|
|
(*method)->agent[i] = agent_priv;
|
|
- }
|
|
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
error3:
|
|
error3:
|
|
@@ -1429,13 +1422,9 @@ check_in_use:
|
|
goto error4;
|
|
goto error4;
|
|
|
|
|
|
/* Finally, add in methods being registered */
|
|
/* Finally, add in methods being registered */
|
|
- for (i = find_first_bit(mad_reg_req->method_mask,
|
|
|
|
- IB_MGMT_MAX_METHODS);
|
|
|
|
- i < IB_MGMT_MAX_METHODS;
|
|
|
|
- i = find_next_bit(mad_reg_req->method_mask, IB_MGMT_MAX_METHODS,
|
|
|
|
- 1+i)) {
|
|
|
|
|
|
+ for_each_set_bit(i, mad_reg_req->method_mask, IB_MGMT_MAX_METHODS)
|
|
(*method)->agent[i] = agent_priv;
|
|
(*method)->agent[i] = agent_priv;
|
|
- }
|
|
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
error4:
|
|
error4:
|