]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4e69b6f) | patch
ath6kl: Fix merge error in ath6kl_set_ies()
authorAarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com>
Thu, 8 Mar 2012 20:25:02 +0000 (12:25 -0800)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 12 Mar 2012 07:46:56 +0000 (09:46 +0200)
commit1cb5902be573cbd0812d19a873c9fcacebde72c6
tree8ad77d9a7f26c779485af2b56a9c263d27b8d7d6tree | snapshot
parent4e69b6fb59b81e049df66bee56ddbd75a6e7e8cccommit | diff
ath6kl: Fix merge error in ath6kl_set_ies()

Portion of the commit id 96ebff3b9b ("ath6kl: Clear the IE in firmware
if not set") was overwritten by mistake due to a merge
conflict. This patch fixes the code back to how it should be.

kvalo: more details to the commit log

Signed-off-by: Aarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath6kl/cfg80211.c diff | blob | history
Linux Kernel Source Tree.