|
@@ -325,7 +325,7 @@ static void atl1c_link_chg_event(struct atl1c_adapter *adapter)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- adapter->work_event |= ATL1C_WORK_EVENT_LINK_CHANGE;
|
|
|
+ set_bit(ATL1C_WORK_EVENT_LINK_CHANGE, &adapter->work_event);
|
|
|
schedule_work(&adapter->common_task);
|
|
|
}
|
|
|
|
|
@@ -337,20 +337,16 @@ static void atl1c_common_task(struct work_struct *work)
|
|
|
adapter = container_of(work, struct atl1c_adapter, common_task);
|
|
|
netdev = adapter->netdev;
|
|
|
|
|
|
- if (adapter->work_event & ATL1C_WORK_EVENT_RESET) {
|
|
|
- adapter->work_event &= ~ATL1C_WORK_EVENT_RESET;
|
|
|
+ if (test_and_clear_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event)) {
|
|
|
netif_device_detach(netdev);
|
|
|
atl1c_down(adapter);
|
|
|
atl1c_up(adapter);
|
|
|
netif_device_attach(netdev);
|
|
|
- return;
|
|
|
}
|
|
|
|
|
|
- if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE) {
|
|
|
- adapter->work_event &= ~ATL1C_WORK_EVENT_LINK_CHANGE;
|
|
|
+ if (test_and_clear_bit(ATL1C_WORK_EVENT_LINK_CHANGE,
|
|
|
+ &adapter->work_event))
|
|
|
atl1c_check_link_status(adapter);
|
|
|
- }
|
|
|
- return;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -369,7 +365,7 @@ static void atl1c_tx_timeout(struct net_device *netdev)
|
|
|
struct atl1c_adapter *adapter = netdev_priv(netdev);
|
|
|
|
|
|
/* Do the reset outside of interrupt context */
|
|
|
- adapter->work_event |= ATL1C_WORK_EVENT_RESET;
|
|
|
+ set_bit(ATL1C_WORK_EVENT_RESET, &adapter->work_event);
|
|
|
schedule_work(&adapter->common_task);
|
|
|
}
|
|
|
|