Skip to content

Commit a04f0ec

Browse files
julianwiedmanndavem330
authored andcommitted
s390/qeth: don't let HW override the configured port role
The only time that our Bridgeport role should change is when we change the configuration ourselves. In which case we also adjust our internal state tracking, no need to do it again when we receive the corresponding event. Removing the locked section helps a subsequent patch that needs to flush the workqueue while under sbp_lock. It would be nice to raise a warning here in case HW does weird things after all, but this could end up generating false-positives when we change the configuration ourselves. Suggested-by: Alexandra Winter <[email protected]> Signed-off-by: Julian Wiedmann <[email protected]> Reviewed-by: Alexandra Winter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1637950 commit a04f0ec

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

drivers/s390/net/qeth_l2_main.c

-6
Original file line numberDiff line numberDiff line change
@@ -1107,12 +1107,6 @@ static void qeth_bridge_state_change_worker(struct work_struct *work)
11071107
NULL
11081108
};
11091109

1110-
/* Role should not change by itself, but if it did, */
1111-
/* information from the hardware is authoritative. */
1112-
mutex_lock(&data->card->sbp_lock);
1113-
data->card->options.sbp.role = entry->role;
1114-
mutex_unlock(&data->card->sbp_lock);
1115-
11161110
snprintf(env_locrem, sizeof(env_locrem), "BRIDGEPORT=statechange");
11171111
snprintf(env_role, sizeof(env_role), "ROLE=%s",
11181112
(entry->role == QETH_SBP_ROLE_NONE) ? "none" :

0 commit comments

Comments
 (0)