iwlwifi: fix-up some merge damage from commit 0d6c4a2