projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
47399f1
062bee4
)
Merge branch 'wireless-2.6' into wireless-next-2.6
author
Reinette Chatre
<reinette.chatre@intel.com>
Fri, 25 Jun 2010 21:47:02 +0000
(14:47 -0700)
committer
Reinette Chatre
<reinette.chatre@intel.com>
Fri, 25 Jun 2010 21:47:02 +0000
(14:47 -0700)
1
2
drivers/net/wireless/ath/ath5k/attach.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath9k/ath9k.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath9k/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath5k/attach.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath9k/ath9k.h
Simple merge
diff --cc
drivers/net/wireless/ath/ath9k/main.c
index 87356fc6f4cd212a23ae07a424c4d5fe47a827a4,1e2a68ea935597a6f3f9499693a59ab8e191841f..efbf53534ade3172eb0e1243782386b604dc2c90
---
1
/
drivers/net/wireless/ath/ath9k/main.c
---
2
/
drivers/net/wireless/ath/ath9k/main.c
+++ b/
drivers/net/wireless/ath/ath9k/main.c
@@@
-450,8
-335,11
+450,12
@@@
set_timer
static void ath_start_ani(struct ath_common *common)
{
+ struct ath_hw *ah = common->ah;
unsigned long timestamp = jiffies_to_msecs(jiffies);
+ struct ath_softc *sc = (struct ath_softc *) common->priv;
+
+ if (!(sc->sc_flags & SC_OP_ANI_RUN))
+ return;
common->ani.longcal_timer = timestamp;
common->ani.shortcal_timer = timestamp;
diff --cc
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge