[FORCEDETH] Fix xmit_lock/netif_tx_lock after merge