summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ddd278)
raw | patch | inline | side by side (parent: 8ddd278)
author | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | |
Mon, 5 Dec 2011 19:59:13 +0000 (11:59 -0800) | ||
committer | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | |
Mon, 5 Dec 2011 19:59:13 +0000 (11:59 -0800) |
index fdd39ec32cf056a62fb9ba3c3d2a078f3738a95a..569886a1d6e573ce4b25218ccd2741d79e8b4ea4 100644 (file)
zd_rf_al2230.o zd_rf_rf2959.o \
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
-@@ -245,7 +245,7 @@ extern void bt_sysfs_cleanup(void);
+@@ -250,7 +250,7 @@ extern void bt_sysfs_cleanup(void);
extern struct dentry *bt_debugfs;
int l2cap_init(void);
void l2cap_exit(void);
#else
-@@ -259,7 +259,7 @@ static inline void l2cap_exit(void)
+@@ -264,7 +264,7 @@ static inline void l2cap_exit(void)
}
#endif
index f4d57e5404acd0c398f11bd5c2d54b3bbd58de09..8340fb4f127415b26ccded88f5349cb6c39d09f4 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -1976,6 +1976,9 @@ struct wiphy_wowlan_support {
+@@ -1977,6 +1977,9 @@ struct wiphy_wowlan_support {
struct wiphy {
/* assign these fields before you register the wiphy */
index d5212ddbdb815fad771ff12b73a47bf6e912a598..ac7935dd757708cbcbf6526ad0a04ee1f65cf17d 100644 (file)
unsigned long state,
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
-@@ -549,9 +549,11 @@ static struct device *bnep_get_device(st
+@@ -545,9 +545,11 @@ static struct device *bnep_get_device(st
return conn ? &conn->dev : NULL;
}
index d0de336d3e731024290de9531806fd0770fdd54b..adec4482860f10e963f9dc1a883c20a19ecaa81d 100644 (file)
spin_unlock_bh(&local->filter_lock);
/* be a bit nasty */
-@@ -647,9 +651,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -606,9 +610,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
INIT_LIST_HEAD(&local->interfaces);
index 1fb68ffe5642556bbdf7cb439e8ac3ed5f589811..1684bc59afae3dcfb3a45e95e23a5383f39a2b3f 100644 (file)
int retry = 0;
while (atomic_read(&sdiodev->suspend) && retry++ != 30)
wait_event_timeout(*wq, false, HZ/100);
-@@ -528,7 +528,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -530,7 +530,7 @@ static void brcmf_ops_sdio_remove(struct
}
}
static int brcmf_sdio_suspend(struct device *dev)
{
mmc_pm_flag_t sdio_flags;
-@@ -583,7 +583,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -585,7 +585,7 @@ static struct sdio_driver brcmf_sdmmc_dr
.remove = brcmf_ops_sdio_remove,
.name = "brcmfmac",
.id_table = brcmf_sdmmc_ids,
index 7cee5d4ed5214dca0d5bb4e9dbed65417c29e6f3..eb2be159ed71061afaaeda46c998e9e95a471b19 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
-@@ -4211,8 +4211,12 @@ static inline int l2cap_data_channel(str
+@@ -4240,8 +4240,12 @@ static inline int l2cap_data_channel(str
if (!sock_owned_by_user(sk)) {
l2cap_ertm_data_rcv(sk, skb);
} else {
index 89f1db193865cc5d60ba86a840ceb38122270261..ef6350ea51ecc8a10b17df2b165d5a77703eb872 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -1140,6 +1140,10 @@ static void __exit ieee80211_exit(void)
+@@ -1105,6 +1105,10 @@ static void __exit ieee80211_exit(void)
rc80211_minstrel_ht_exit();
rc80211_minstrel_exit();