From cb14a8441ab2e9a8bdd574d1e96d78e193f55890 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 31 Aug 2012 14:07:13 -0700 Subject: [PATCH] compat-drivers: synch with linux-next 20120824 This synchs with linux-next 20120824. Signed-off-by: Luis R. Rodriguez --- patches/drm/04-revert-prime-support.patch | 4 ++-- patches/network/03-rfkill.patch | 2 +- patches/network/11-dev-pm-ops.patch | 4 ++-- patches/network/12-mac80211-disable-tx-status.patch | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch index b9ce93d2f23e..39af15259ec8 100644 --- a/patches/drm/04-revert-prime-support.patch +++ b/patches/drm/04-revert-prime-support.patch @@ -123,7 +123,7 @@ not < 3.3.0. +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c -@@ -342,8 +342,10 @@ static const struct file_operations rade +@@ -343,8 +343,10 @@ static const struct file_operations rade static struct drm_driver kms_driver = { .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | @@ -136,7 +136,7 @@ not < 3.3.0. .dev_priv_size = 0, .load = radeon_driver_load_kms, .firstopen = radeon_driver_firstopen_kms, -@@ -378,10 +380,12 @@ static struct drm_driver kms_driver = { +@@ -379,10 +381,12 @@ static struct drm_driver kms_driver = { .dumb_destroy = radeon_mode_dumb_destroy, .fops = &radeon_driver_kms_fops, diff --git a/patches/network/03-rfkill.patch b/patches/network/03-rfkill.patch index 9fa08d2bfb34..ade4c4525667 100644 --- a/patches/network/03-rfkill.patch +++ b/patches/network/03-rfkill.patch @@ -55,7 +55,7 @@ This would do the policing from within mac80211. error = input_register_handle(handle); --- a/net/rfkill/core.c +++ b/net/rfkill/core.c -@@ -806,7 +806,7 @@ static int rfkill_resume(struct device * +@@ -820,7 +820,7 @@ static int rfkill_resume(struct device * } static struct class rfkill_class = { diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch index d00031048e27..007a59d92427 100644 --- a/patches/network/11-dev-pm-ops.patch +++ b/patches/network/11-dev-pm-ops.patch @@ -210,7 +210,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -337,6 +337,9 @@ static int iwl_pci_resume(struct device +@@ -343,6 +343,9 @@ static int iwl_pci_resume(struct device return iwl_trans_resume(iwl_trans); } @@ -220,7 +220,7 @@ calls on compat code with only slight modifications. static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -361,7 +364,12 @@ static struct pci_driver iwl_pci_driver +@@ -367,7 +370,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = __devexit_p(iwl_pci_remove), diff --git a/patches/network/12-mac80211-disable-tx-status.patch b/patches/network/12-mac80211-disable-tx-status.patch index 97ac8d335f40..c11d11f9ced2 100644 --- a/patches/network/12-mac80211-disable-tx-status.patch +++ b/patches/network/12-mac80211-disable-tx-status.patch @@ -6,7 +6,7 @@ So we need to just ifdef this part out. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1958,6 +1958,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1952,6 +1952,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail; } @@ -14,7 +14,7 @@ So we need to just ifdef this part out. if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -1996,6 +1997,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1990,6 +1991,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } -- 2.30.2