Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
int ath_pci_init(void)
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
-@@ -2038,15 +2038,17 @@ int iwl_legacy_pci_resume(struct device
+@@ -2048,15 +2048,17 @@ int iwl_legacy_pci_resume(struct device
}
EXPORT_SYMBOL(iwl_legacy_pci_resume);
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
-@@ -3569,8 +3569,12 @@ static inline int l2cap_data_channel(str
+@@ -3575,8 +3575,12 @@ static inline int l2cap_data_channel(str
if (!sock_owned_by_user(sk)) {
l2cap_ertm_data_rcv(sk, skb);
} else {