projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c43933e
f09a878
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
author
John W. Linville
<linville@tuxdriver.com>
Tue, 23 Apr 2013 18:09:39 +0000
(14:09 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 23 Apr 2013 18:09:39 +0000
(14:09 -0400)
Conflicts:
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
1
2
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/b43/phy_n.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/ssb/driver_chipcommon_pmu.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/iface.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/mlme.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
index 18413123efd7b56e2762043621ca717bfb3ea6ae,73fe8d6db566789ad2c6f34021d607c48a380855..491305c81fcecd36f5bc9bae0d7b66afd1a7e45e
---
1
/
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
---
2
/
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
+++ b/
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
@@@
-143,9
-142,8
+143,9
@@@
channel_detector_create(struct dfs_patt
{
u32 sz, i;
struct channel_detector *cd;
+ struct ath_common *common = ath9k_hw_common(dpd->ah);
- cd = kmalloc(sizeof(*cd), GFP_
KERNEL
);
+ cd = kmalloc(sizeof(*cd), GFP_
ATOMIC
);
if (cd == NULL)
goto fail;
diff --cc
drivers/net/wireless/ath/ath9k/dfs_pri_detector.c
Simple merge
diff --cc
drivers/net/wireless/b43/phy_n.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge
diff --cc
drivers/ssb/driver_chipcommon_pmu.c
Simple merge
diff --cc
net/mac80211/iface.c
Simple merge
diff --cc
net/mac80211/mlme.c
Simple merge