compat-drivers: refresh patches for next-20121002

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/patches/drm/01-dma_buf_ops-addition.patch b/patches/drm/01-dma_buf_ops-addition.patch
index 8fc01abdc713097448dcc3dcc484cbf2331c3c91..4b3026e54a88d79601bf728ccd8d9bfb8e4fbcce 100644 (file)
--- a/patches/drm/01-dma_buf_ops-addition.patch
+++ b/patches/drm/01-dma_buf_ops-addition.patch
@@ -10,7 +10,7 @@ on kernels < 3.4.
 
 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
 +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
-@@ -173,10 +173,14 @@ static const struct dma_buf_ops i915_dma
+@@ -215,10 +215,14 @@ static const struct dma_buf_ops i915_dma
        .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
        .kunmap = i915_gem_dmabuf_kunmap,
        .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,

diff --git a/patches/drm/02-revert-vm_mmap.patch b/patches/drm/02-revert-vm_mmap.patch
index 9454223e1af5cb9786ded5bc4ede7309ba489c11..acdb656677982bf1355d91e889353258cbad91f9 100644 (file)
--- a/patches/drm/02-revert-vm_mmap.patch
+++ b/patches/drm/02-revert-vm_mmap.patch
@@ -73,7 +73,7 @@ These can't be backported as they rely on non-exported symbols.
  
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1301,10 +1301,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
+@@ -1296,10 +1296,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
                drm_gem_object_unreference_unlocked(obj);
                return -EINVAL;
        }

diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch
index 1b29c2459cdee42a3d6d5da2f37e5ea985675daa..e9baec2b890270e7af68d4bb4b630bb19d8d02c5 100644 (file)
--- a/patches/drm/04-revert-prime-support.patch
+++ b/patches/drm/04-revert-prime-support.patch
@@ -17,7 +17,7 @@ not < 3.3.0.
        DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED),
 +#endif
  
-       DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+       DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
        DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
 --- a/drivers/gpu/drm/drm_fops.c
 +++ b/drivers/gpu/drm/drm_fops.c
@@ -347,7 +347,7 @@ not < 3.3.0.
  #include "drmP.h"
  #include "i915_drv.h"
  #include <linux/dma-buf.h>
-@@ -249,3 +250,4 @@ fail_detach:
+@@ -302,3 +303,4 @@ fail_detach:
        dma_buf_detach(dma_buf, attach);
        return ERR_PTR(ret);
  }

diff --git a/patches/drm/07-intel-gtt.patch b/patches/drm/07-intel-gtt.patch
index 6b3fabeb3b87735160cf4e375c8d28581e89c265..378d32cd794963a432e0b152cb3c8a31dc01750f 100644 (file)
--- a/patches/drm/07-intel-gtt.patch
+++ b/patches/drm/07-intel-gtt.patch
@@ -24,7 +24,7 @@ Date:   Thu Jun 7 15:56:03 2012 +0200
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3914,8 +3914,10 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3962,8 +3962,10 @@ i915_gem_init_hw(struct drm_device *dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
  

diff --git a/patches/drm/08-shmem_truncate_range.patch b/patches/drm/08-shmem_truncate_range.patch
index 71ad03bfa1490fdffc547105e8d4bae229ad454e..08d1eca025c9dd4e5b52a2bad688871a039de1f2 100644 (file)
--- a/patches/drm/08-shmem_truncate_range.patch
+++ b/patches/drm/08-shmem_truncate_range.patch
@@ -27,7 +27,7 @@ Date:   Mon Jun 27 16:18:19 2011 -0700
 
 --- a/drivers/gpu/drm/i915/i915_gem.c
 +++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -1648,7 +1648,14 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1643,7 +1643,14 @@ i915_gem_object_truncate(struct drm_i915
         * backing pages, *now*.
         */
        inode = obj->base.filp->f_path.dentry->d_inode;

diff --git a/patches/network/0001-netdev_ops.patch b/patches/network/0001-netdev_ops.patch
index 1a4bb09a4e97930101563ff367d23a53ee68dd60..338bdf7380be9519e23798a50a09693b314aaf66 100644 (file)
--- a/patches/network/0001-netdev_ops.patch
+++ b/patches/network/0001-netdev_ops.patch
@@ -157,7 +157,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        dev->tx_queue_len = 0;
 --- a/drivers/net/wireless/mwifiex/main.c
 +++ b/drivers/net/wireless/mwifiex/main.c
-@@ -638,7 +638,7 @@ static const struct net_device_ops mwifi
+@@ -655,7 +655,7 @@ static const struct net_device_ops mwifi
  void mwifiex_init_priv_params(struct mwifiex_private *priv,
                                                struct net_device *dev)
  {

diff --git a/patches/network/0005-netlink-portid.patch b/patches/network/0005-netlink-portid.patch
index e299640cb77c3f52420918a59ec4ce99418f1e40..8b69b8c544ba8e90db9128dd725569ac361acedb 100644 (file)
--- a/patches/network/0005-netlink-portid.patch
+++ b/patches/network/0005-netlink-portid.patch
@@ -282,7 +282,7 @@ this one should other drivers / subsystem need this change.
  
        return 0;
  }
-@@ -8855,8 +8855,8 @@ static int nl80211_netlink_notify(struct
+@@ -8889,8 +8889,8 @@ static int nl80211_netlink_notify(struct
  
        list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {
                list_for_each_entry_rcu(wdev, &rdev->wdev_list, list)

diff --git a/patches/network/03-rfkill.patch b/patches/network/03-rfkill.patch
index ade4c4525667028027758e59b4b8b4f56508af66..c19b42e70d47dc3b89c2e4bd2aaa9d1e207e84fa 100644 (file)
--- 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
-@@ -820,7 +820,7 @@ static int rfkill_resume(struct device *
+@@ -826,7 +826,7 @@ static int rfkill_resume(struct device *
  }
  
  static struct class rfkill_class = {

diff --git a/patches/network/09-cfg80211-wext-padding.patch b/patches/network/09-cfg80211-wext-padding.patch
index 6db2db89ad9ea8bea78a0b7a9fa3ec21c8aa785c..6fe2ff09c97a8ad290cfa8348e8f4f5275571644 100644 (file)
--- a/patches/network/09-cfg80211-wext-padding.patch
+++ b/patches/network/09-cfg80211-wext-padding.patch
@@ -30,7 +30,7 @@ moved due to struct enlargements.
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -2155,6 +2155,9 @@ struct wiphy_wowlan_support {
+@@ -2153,6 +2153,9 @@ struct wiphy_wowlan_support {
  struct wiphy {
        /* assign these fields before you register the wiphy */
  

diff --git a/patches/network/09-threaded-irq.patch b/patches/network/09-threaded-irq.patch
index df57be559d8746a04b8847d54c02407335d1ecfa..929d527b1afad9cd979e7c302c5b928159443863 100644 (file)
--- a/patches/network/09-threaded-irq.patch
+++ b/patches/network/09-threaded-irq.patch
@@ -63,9 +63,9 @@ thread in process context as well.
  /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */
 --- a/drivers/net/wireless/ti/wlcore/main.c
 +++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -5540,14 +5540,25 @@ int __devinit wlcore_probe(struct wl1271
- 
-       platform_set_drvdata(pdev, wl);
+@@ -5567,14 +5567,25 @@ static void wlcore_nvs_cb(const struct f
+       wl->set_power = pdata->set_power;
+       wl->if_ops = pdata->ops;
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
 +      irqflags = IRQF_TRIGGER_RISING;
@@ -88,8 +88,8 @@ thread in process context as well.
 +#endif
        if (ret < 0) {
                wl1271_error("request_irq() failed: %d", ret);
-               goto out_free_hw;
-@@ -5621,7 +5632,11 @@ out_unreg:
+               goto out_free_nvs;
+@@ -5649,7 +5660,11 @@ out_unreg:
        wl1271_unregister_hw(wl);
  
  out_irq:
@@ -99,9 +99,9 @@ thread in process context as well.
        free_irq(wl->irq, wl);
 +#endif
  
- out_free_hw:
-       wlcore_free_hw(wl);
-@@ -5640,7 +5655,12 @@ int __devexit wlcore_remove(struct platf
+ out_free_nvs:
+       kfree(wl->nvs);
+@@ -5695,7 +5710,12 @@ int __devexit wlcore_remove(struct platf
                disable_irq_wake(wl->irq);
        }
        wl1271_unregister_hw(wl);
@@ -116,8 +116,8 @@ thread in process context as well.
        return 0;
 --- a/drivers/net/wireless/ti/wlcore/wlcore.h
 +++ b/drivers/net/wireless/ti/wlcore/wlcore.h
-@@ -141,7 +141,9 @@ struct wl1271_stats {
- struct wl1271 {
+@@ -149,7 +149,9 @@ struct wl1271 {
+       bool initialized;
        struct ieee80211_hw *hw;
        bool mac80211_registered;
 -
@@ -125,5 +125,5 @@ thread in process context as well.
 +      struct compat_threaded_irq irq_compat;
 +#endif
        struct device *dev;
+       struct platform_device *pdev;
  
-       void *if_priv;

diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch
index d0b8982f08ccaec24b2db117cbb605e7c2a98d8d..463253bc9a6061dd58de25ee154fb2c79e50b09a 100644 (file)
--- a/patches/network/11-dev-pm-ops.patch
+++ b/patches/network/11-dev-pm-ops.patch
@@ -109,7 +109,7 @@ calls on compat code with only slight modifications.
  module_pci_driver(ath5k_pci_driver);
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -337,14 +337,10 @@ static int ath_pci_resume(struct device
+@@ -338,14 +338,10 @@ static int ath_pci_resume(struct device
        return 0;
  }
  
@@ -128,7 +128,7 @@ calls on compat code with only slight modifications.
  
  #define ATH9K_PM_OPS  (&ath9k_pm_ops)
  
-@@ -362,7 +358,12 @@ static struct pci_driver ath_pci_driver
+@@ -363,7 +359,12 @@ static struct pci_driver ath_pci_driver
        .id_table   = ath_pci_id_table,
        .probe      = ath_pci_probe,
        .remove     = ath_pci_remove,

diff --git a/patches/network/14-device-type.patch b/patches/network/14-device-type.patch
index 7c0c097f558201c5a9b355a431eced5df5dfa9e8..f1c9330c19c1c0f90fcc0f664ffa088374df6ee6 100644 (file)
--- a/patches/network/14-device-type.patch
+++ b/patches/network/14-device-type.patch
@@ -22,7 +22,7 @@ compile warning.
                               enum nl80211_iftype iftype, int num)
 --- a/net/bluetooth/bnep/core.c
 +++ b/net/bluetooth/bnep/core.c
-@@ -528,9 +528,11 @@ static struct device *bnep_get_device(st
+@@ -527,9 +527,11 @@ static struct device *bnep_get_device(st
        return conn ? &conn->dev : NULL;
  }
  

diff --git a/patches/network/16-bluetooth.patch b/patches/network/16-bluetooth.patch
index a4b6276df045faf44d1335546bf3e136e4de9369..099f5013878aa7a80a84342edff26049b04766e0 100644 (file)
--- a/patches/network/16-bluetooth.patch
+++ b/patches/network/16-bluetooth.patch
@@ -262,7 +262,7 @@ here still, but for now we keep this here.
  static int hidp_parse(struct hid_device *hid)
  {
        struct hidp_session *session = hid->driver_data;
-@@ -938,7 +1019,9 @@ static int hidp_setup_hid(struct hidp_se
+@@ -942,7 +1023,9 @@ static int hidp_setup_hid(struct hidp_se
        hid->dev.parent = &session->conn->dev;
        hid->ll_driver = &hidp_hid_driver;
  
@@ -272,7 +272,7 @@ here still, but for now we keep this here.
        hid->hid_output_raw_report = hidp_output_raw_report;
  
        return 0;
-@@ -949,6 +1032,7 @@ fault:
+@@ -953,6 +1036,7 @@ fault:
  
        return err;
  }
@@ -280,7 +280,7 @@ here still, but for now we keep this here.
  
  int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock)
  {
-@@ -964,6 +1048,39 @@ int hidp_add_connection(struct hidp_conn
+@@ -968,6 +1052,39 @@ int hidp_add_connection(struct hidp_conn
  
        BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size);
  
@@ -320,7 +320,7 @@ here still, but for now we keep this here.
        down_write(&hidp_session_sem);
  
        s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
-@@ -1011,6 +1128,7 @@ int hidp_add_connection(struct hidp_conn
+@@ -1015,6 +1132,7 @@ int hidp_add_connection(struct hidp_conn
  
        __hidp_link_session(session);
  
@@ -328,7 +328,7 @@ here still, but for now we keep this here.
        if (req->rd_size > 0) {
                err = hidp_setup_hid(session, req);
                if (err)
-@@ -1022,6 +1140,16 @@ int hidp_add_connection(struct hidp_conn
+@@ -1026,6 +1144,16 @@ int hidp_add_connection(struct hidp_conn
                if (err < 0)
                        goto purge;
        }
@@ -345,7 +345,7 @@ here still, but for now we keep this here.
  
        hidp_set_timer(session);
  
-@@ -1080,6 +1208,7 @@ unlink:
+@@ -1084,6 +1212,7 @@ unlink:
                session->input = NULL;
        }
  
@@ -353,7 +353,7 @@ here still, but for now we keep this here.
        if (session->hid) {
                hid_destroy_device(session->hid);
                session->hid = NULL;
-@@ -1093,10 +1222,15 @@ purge:
+@@ -1097,10 +1226,15 @@ purge:
  
        skb_queue_purge(&session->ctrl_transmit);
        skb_queue_purge(&session->intr_transmit);

diff --git a/patches/network/29-sdio_no_suspend.patch b/patches/network/29-sdio_no_suspend.patch
index 5dfacb9e3fbf4c9518c54eb26013dcc63d152aff..d06e5ebffac5d852096af348668d6cad592e8c63 100644 (file)
--- a/patches/network/29-sdio_no_suspend.patch
+++ b/patches/network/29-sdio_no_suspend.patch
@@ -171,7 +171,7 @@ suspend and resume that are not backported.
        },
 --- a/drivers/bluetooth/btmrvl_sdio.c
 +++ b/drivers/bluetooth/btmrvl_sdio.c
-@@ -1044,6 +1044,7 @@ static void btmrvl_sdio_remove(struct sd
+@@ -1052,6 +1052,7 @@ static void btmrvl_sdio_remove(struct sd
        }
  }
  
@@ -179,7 +179,7 @@ suspend and resume that are not backported.
  static int btmrvl_sdio_suspend(struct device *dev)
  {
        struct sdio_func *func = dev_to_sdio_func(dev);
-@@ -1139,6 +1140,7 @@ static const struct dev_pm_ops btmrvl_sd
+@@ -1147,6 +1148,7 @@ static const struct dev_pm_ops btmrvl_sd
        .suspend        = btmrvl_sdio_suspend,
        .resume         = btmrvl_sdio_resume,
  };
@@ -187,7 +187,7 @@ suspend and resume that are not backported.
  
  static struct sdio_driver bt_mrvl_sdio = {
        .name           = "btmrvl_sdio",
-@@ -1147,7 +1149,9 @@ static struct sdio_driver bt_mrvl_sdio =
+@@ -1155,7 +1157,9 @@ static struct sdio_driver bt_mrvl_sdio =
        .remove         = btmrvl_sdio_remove,
        .drv = {
                .owner = THIS_MODULE,

diff --git a/patches/network/45-remove-platform-id-table.patch b/patches/network/45-remove-platform-id-table.patch
index 5adcf21399aced1a4f965dd4a542f3b056eef441..886b52d222de3152a8208156b8be04e3e7e096cb 100644 (file)
--- a/patches/network/45-remove-platform-id-table.patch
+++ b/patches/network/45-remove-platform-id-table.patch
@@ -1,7 +1,7 @@
 --- a/drivers/net/wireless/ti/wl12xx/main.c
 +++ b/drivers/net/wireless/ti/wl12xx/main.c
-@@ -1698,16 +1698,20 @@ static int __devinit wl12xx_probe(struct
-       return wlcore_probe(wl, pdev);
+@@ -1725,16 +1725,20 @@ out:
+       return ret;
  }
  
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)

diff --git a/patches/network/47-no_trans_start_on_netdev_queue.patch b/patches/network/47-no_trans_start_on_netdev_queue.patch
index 024dae9cd9da734792a01747c2d012243124846c..2c46b9a6309174c01bc114002f1e1d027ed2cd59 100644 (file)
--- a/patches/network/47-no_trans_start_on_netdev_queue.patch
+++ b/patches/network/47-no_trans_start_on_netdev_queue.patch
@@ -4,7 +4,7 @@ on older kernels.
 
 --- a/drivers/net/wireless/mwifiex/init.c
 +++ b/drivers/net/wireless/mwifiex/init.c
-@@ -373,8 +373,10 @@ void mwifiex_set_trans_start(struct net_
+@@ -374,8 +374,10 @@ void mwifiex_set_trans_start(struct net_
  {
        int i;
  

diff --git a/patches/network/62-usb_driver_lpm.patch b/patches/network/62-usb_driver_lpm.patch
index b3fcde5f29838b30020f23f5a30da84764fcdba9..5f568866e687b090dcc9ae0192c4928de822ea2c 100644 (file)
--- a/patches/network/62-usb_driver_lpm.patch
+++ b/patches/network/62-usb_driver_lpm.patch
@@ -132,7 +132,7 @@
  module_usb_driver(carl9170_driver);
 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
-@@ -1589,7 +1589,9 @@ static struct usb_driver brcmf_usbdrvr =
+@@ -1563,7 +1563,9 @@ static struct usb_driver brcmf_usbdrvr =
        .suspend = brcmf_usb_suspend,
        .resume = brcmf_usb_resume,
        .supports_autosuspend = 1,
@@ -204,7 +204,7 @@
  module_usb_driver(rndis_wlan_driver);
 --- a/drivers/net/wireless/rt2x00/rt2500usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
-@@ -1989,7 +1989,9 @@ static struct usb_driver rt2500usb_drive
+@@ -1988,7 +1988,9 @@ static struct usb_driver rt2500usb_drive
        .disconnect     = rt2x00usb_disconnect,
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,
@@ -216,7 +216,7 @@
  module_usb_driver(rt2500usb_driver);
 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -1283,7 +1283,9 @@ static struct usb_driver rt2800usb_drive
+@@ -1282,7 +1282,9 @@ static struct usb_driver rt2800usb_drive
        .disconnect     = rt2x00usb_disconnect,
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,
@@ -228,7 +228,7 @@
  module_usb_driver(rt2800usb_driver);
 --- a/drivers/net/wireless/rt2x00/rt73usb.c
 +++ b/drivers/net/wireless/rt2x00/rt73usb.c
-@@ -2536,7 +2536,9 @@ static struct usb_driver rt73usb_driver
+@@ -2535,7 +2535,9 @@ static struct usb_driver rt73usb_driver
        .disconnect     = rt2x00usb_disconnect,
        .suspend        = rt2x00usb_suspend,
        .resume         = rt2x00usb_resume,