Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes, nothing serious. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -284,6 +284,7 @@ static void qeth_l2_stop_card(struct qeth_card *card)
|
||||
if (card->state == CARD_STATE_SOFTSETUP) {
|
||||
qeth_clear_ipacmd_list(card);
|
||||
qeth_drain_output_queues(card);
|
||||
cancel_delayed_work_sync(&card->buffer_reclaim_work);
|
||||
card->state = CARD_STATE_DOWN;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user