From: Luis R. Rodriguez Date: Wed, 30 Mar 2011 18:27:38 +0000 (-0700) Subject: compat-wireless: refresh patches for 2.6.39-rc1 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6e514aa9849e7ec78c6839b12eacc03b416d692;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh patches for 2.6.39-rc1 Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 7c77b78f0209..2922f7a3d892 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -119,7 +119,7 @@ calls on compat code with only slight modifications. 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); diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch index 1a00cfc81559..4ff345e43235 100644 --- a/patches/31-backport-sk_add_backlog.patch +++ b/patches/31-backport-sk_add_backlog.patch @@ -9,7 +9,7 @@ backlog. --- 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 {