compat-wireless: refresh patches for 2.6.39-rc1
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 30 Mar 2011 18:27:38 +0000 (11:27 -0700)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 30 Mar 2011 18:27:38 +0000 (11:27 -0700)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
patches/11-dev-pm-ops.patch
patches/31-backport-sk_add_backlog.patch

index 7c77b78f020993087967dd50121721eee3d167e1..2922f7a3d892b8fecac2dd27b629c3ff5e65fa73 100644 (file)
@@ -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);
  
index 1a00cfc815591a8b29163e67125e5a3bf1f213d7..4ff345e43235949253122c2df27b265621d9a6b8 100644 (file)
@@ -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 {