iwlwifi: fix mis-merge that breaks the driver