]> git.baikalelectronics.ru Git - kernel.git/commit
iwlwifi: mvm: fix merge damage
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 16 Mar 2014 06:51:47 +0000 (08:51 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 16 Mar 2014 06:51:47 +0000 (08:51 +0200)
commit44215440bff3e21d2b91249c5d97f5d637ca9f35
treef0259a868f2f84fa95523103f746fe0cb38968bc
parent6c042b20b92bd45e96a3794ec925c9060343475c
iwlwifi: mvm: fix merge damage

Scheduled scan was disabled because it was broken. Now it is
fixed and got disabled by mistake by a merge.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/mac80211.c