compat-drivers: refresh patches for next-20130320

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

patches/collateral-evolutions/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
-@@ -215,10 +215,14 @@ static const struct dma_buf_ops i915_dma
+@@ -216,10 +216,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,

patches/collateral-evolutions/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
-@@ -1302,10 +1302,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
+@@ -1294,10 +1294,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
  		drm_gem_object_unreference_unlocked(obj);
  		return -EINVAL;
  	}

patches/collateral-evolutions/drm/04-revert-prime-support.patch

@@ -82,7 +82,7 @@ not < 3.3.0.
  #include <linux/export.h>
  #include <linux/dma-buf.h>
  #include <drm/drmP.h>
-@@ -536,3 +538,4 @@ void drm_prime_remove_imported_buf_handl
+@@ -532,3 +534,4 @@ void drm_prime_remove_imported_buf_handl
  	mutex_unlock(&prime_fpriv->lock);
  }
  EXPORT_SYMBOL(drm_prime_remove_imported_buf_handle);
@@ -282,7 +282,7 @@ not < 3.3.0.
 
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -1036,7 +1036,11 @@ static struct drm_driver driver = {
+@@ -1025,7 +1025,11 @@ static struct drm_driver driver = {
  	 */
  	.driver_features =
  	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
@@ -294,7 +294,7 @@ not < 3.3.0.
  	.load = i915_driver_load,
  	.unload = i915_driver_unload,
  	.open = i915_driver_open,
-@@ -1059,10 +1063,12 @@ static struct drm_driver driver = {
+@@ -1048,10 +1052,12 @@ static struct drm_driver driver = {
  	.gem_free_object = i915_gem_free_object,
  	.gem_vm_ops = &i915_gem_vm_ops,
 
@@ -319,7 +319,7 @@ not < 3.3.0.
 
  static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj);
  static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj);
-@@ -3819,8 +3821,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3824,8 +3826,10 @@ void i915_gem_free_object(struct drm_gem
 
  	BUG_ON(obj->pages);
 
@@ -340,7 +340,7 @@ not < 3.3.0.
  #include <drm/drmP.h>
  #include "i915_drv.h"
  #include <linux/dma-buf.h>
-@@ -306,3 +307,4 @@ fail_detach:
+@@ -307,3 +308,4 @@ fail_detach:
  	dma_buf_detach(dma_buf, attach);
  	return ERR_PTR(ret);
  }

patches/collateral-evolutions/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
-@@ -3991,9 +3991,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3996,9 +3996,14 @@ i915_gem_init_hw(struct drm_device *dev)
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	int ret;
 

patches/collateral-evolutions/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
-@@ -1628,7 +1628,13 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1620,7 +1620,13 @@ i915_gem_object_truncate(struct drm_i915
  	 * backing pages, *now*.
  	 */
  	inode = file_inode(obj->base.filp);

patches/collateral-evolutions/network/0001-netdev_ops.patch

@@ -60,7 +60,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
 
 --- a/drivers/net/wireless/ath/ath6kl/main.c
 +++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1322,7 +1322,7 @@ static const struct net_device_ops ath6k
+@@ -1289,7 +1289,7 @@ static const struct net_device_ops ath6k
 
  void init_netdev(struct net_device *dev)
  {

patches/collateral-evolutions/network/11-dev-pm-ops.patch

@@ -134,7 +134,7 @@ calls on compat code with only slight modifications.
  int ath_pci_init(void)
 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -3907,7 +3907,12 @@ static struct pci_driver il3945_driver =
+@@ -3909,7 +3909,12 @@ static struct pci_driver il3945_driver =
  	.id_table = il3945_hw_card_ids,
  	.probe = il3945_pci_probe,
  	.remove = il3945_pci_remove,
@@ -164,7 +164,7 @@ calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -4939,8 +4939,17 @@ il_pci_resume(struct device *device)
+@@ -4936,8 +4936,17 @@ il_pci_resume(struct device *device)
  	return 0;
  }
 

patches/collateral-evolutions/network/16-bluetooth.patch

@@ -462,7 +462,7 @@ here still, but for now we keep this here.
  	struct rfcomm_dlc *dlc = dev->dlc;
 --- a/net/bluetooth/sco.c
 +++ b/net/bluetooth/sco.c
-@@ -422,8 +422,12 @@ static struct sock *sco_sock_alloc(struc
+@@ -423,8 +423,12 @@ static struct sock *sco_sock_alloc(struc
  	return sk;
  }
 
@@ -475,7 +475,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
 
-@@ -674,7 +678,11 @@ static int sco_sock_recvmsg(struct kiocb
+@@ -675,7 +679,11 @@ static int sco_sock_recvmsg(struct kiocb
  	return bt_sock_recvmsg(iocb, sock, msg, len, flags);
  }
 

patches/collateral-evolutions/network/24-pcmcia.patch

@@ -982,7 +982,7 @@
 
  	/*
  	 * Most of the libertas cards can do unaligned register access, but some
-@@ -1002,7 +1077,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);
+@@ -1001,7 +1076,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids);
 
  static struct pcmcia_driver lbs_driver = {
  	.owner		= THIS_MODULE,

patches/collateral-evolutions/network/25-multicast-list_head.patch

@@ -782,7 +782,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
 
 --- a/drivers/net/wireless/ath/ath6kl/main.c
 +++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1238,7 +1238,11 @@ static void ath6kl_set_multicast_list(st
+@@ -1205,7 +1205,11 @@ static void ath6kl_set_multicast_list(st
  	list_for_each_entry_safe(mc_filter, tmp, &vif->mc_filter, list) {
  		found = false;
  		netdev_for_each_mc_addr(ha, ndev) {
@@ -794,7 +794,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  				   ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) {
  				found = true;
  				break;
-@@ -1272,7 +1276,11 @@ static void ath6kl_set_multicast_list(st
+@@ -1239,7 +1243,11 @@ static void ath6kl_set_multicast_list(st
  	netdev_for_each_mc_addr(ha, ndev) {
  		found = false;
  		list_for_each_entry(mc_filter, &vif->mc_filter, list) {
@@ -806,7 +806,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  				   ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) {
  				found = true;
  				break;
-@@ -1287,7 +1295,11 @@ static void ath6kl_set_multicast_list(st
+@@ -1254,7 +1262,11 @@ static void ath6kl_set_multicast_list(st
  				goto out;
  			}
 

patches/collateral-evolutions/network/29-sdio_no_suspend.patch

@@ -5,15 +5,15 @@ suspend and resume that are not backported.
 
 --- a/drivers/net/wireless/ath/ath6kl/sdio.c
 +++ b/drivers/net/wireless/ath/ath6kl/sdio.c
-@@ -807,6 +807,7 @@ out:
+@@ -817,6 +817,7 @@ out:
  	return ret;
  }
 
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
  static int ath6kl_set_sdio_pm_caps(struct ath6kl *ar)
  {
  	struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
-@@ -940,6 +941,17 @@ static int ath6kl_sdio_resume(struct ath
+@@ -950,6 +951,17 @@ static int ath6kl_sdio_resume(struct ath
 
  	return 0;
  }
@@ -31,7 +31,7 @@ suspend and resume that are not backported.
 
  /* set the window address register (using 4-byte register access ). */
  static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr)
-@@ -1251,7 +1263,7 @@ static const struct ath6kl_hif_ops ath6k
+@@ -1263,7 +1275,7 @@ static const struct ath6kl_hif_ops ath6k
  	.stop = ath6kl_sdio_stop,
  };
 
@@ -40,7 +40,7 @@ suspend and resume that are not backported.
 
  /*
   * Empty handlers so that mmc subsystem doesn't remove us entirely during
-@@ -1401,7 +1413,9 @@ static struct sdio_driver ath6kl_sdio_dr
+@@ -1413,7 +1425,9 @@ static struct sdio_driver ath6kl_sdio_dr
  	.id_table = ath6kl_sdio_devices,
  	.probe = ath6kl_sdio_probe,
  	.remove = ath6kl_sdio_remove,

patches/collateral-evolutions/network/40-netdev-hw-features.patch

@@ -332,23 +332,23 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  #endif /* ATLX_C */
 --- a/drivers/net/wireless/ath/ath6kl/main.c
 +++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1149,6 +1149,7 @@ static struct net_device_stats *ath6kl_g
+@@ -1116,6 +1116,7 @@ static struct net_device_stats *ath6kl_g
  	return &vif->net_stats;
  }
 
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
  static int ath6kl_set_features(struct net_device *dev,
  			       netdev_features_t features)
  {
-@@ -1181,6 +1182,7 @@ static int ath6kl_set_features(struct ne
+@@ -1148,6 +1149,7 @@ static int ath6kl_set_features(struct ne
 
  	return err;
  }
 +#endif
 
  static void ath6kl_set_multicast_list(struct net_device *ndev)
  {
-@@ -1328,7 +1330,9 @@ static const struct net_device_ops ath6k
+@@ -1295,7 +1297,9 @@ static const struct net_device_ops ath6k
  	.ndo_stop               = ath6kl_close,
  	.ndo_start_xmit         = ath6kl_data_tx,
  	.ndo_get_stats          = ath6kl_get_stats,
@@ -358,9 +358,9 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  	.ndo_set_rx_mode	= ath6kl_set_multicast_list,
  };
 
-@@ -1343,7 +1347,11 @@ void init_netdev(struct net_device *dev)
- 				sizeof(struct wmi_data_hdr) + HTC_HDR_LENGTH
- 				+ WMI_MAX_TX_META_SZ + ATH6KL_HTC_ALIGN_BYTES;
+@@ -1312,7 +1316,11 @@ void init_netdev(struct net_device *dev)
+ 					WMI_MAX_TX_META_SZ +
+ 					ATH6KL_HTC_ALIGN_BYTES, 4);
 
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
  	dev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM;

patches/collateral-evolutions/network/46-use_other_workqueue.patch

@@ -4,7 +4,7 @@ position before.
 
 --- a/net/bluetooth/hci_core.c
 +++ b/net/bluetooth/hci_core.c
-@@ -2068,16 +2068,24 @@ int hci_register_dev(struct hci_dev *hde
+@@ -2066,16 +2066,24 @@ int hci_register_dev(struct hci_dev *hde
  	list_add(&hdev->list, &hci_dev_list);
  	write_unlock(&hci_dev_list_lock);
 

patches/collateral-evolutions/network/62-usb_driver_lpm.patch

@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/ath3k.c
 +++ b/drivers/bluetooth/ath3k.c
-@@ -467,7 +467,9 @@ static struct usb_driver ath3k_driver =
+@@ -471,7 +471,9 @@ static struct usb_driver ath3k_driver =
  	.probe		= ath3k_probe,
  	.disconnect	= ath3k_disconnect,
  	.id_table	= ath3k_table,
@@ -48,7 +48,7 @@
  module_usb_driver(bpa10x_driver);
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
-@@ -1231,7 +1231,9 @@ static struct usb_driver btusb_driver =
+@@ -1233,7 +1233,9 @@ static struct usb_driver btusb_driver =
  #endif
  	.id_table	= btusb_table,
  	.supports_autosuspend = 1,
@@ -96,7 +96,7 @@
  static int __init at76_mod_init(void)
 --- a/drivers/net/wireless/ath/ath6kl/usb.c
 +++ b/drivers/net/wireless/ath/ath6kl/usb.c
-@@ -1199,7 +1199,9 @@ static struct usb_driver ath6kl_usb_driv
+@@ -1207,7 +1207,9 @@ static struct usb_driver ath6kl_usb_driv
  	.disconnect = ath6kl_usb_remove,
  	.id_table = ath6kl_usb_ids,
  	.supports_autosuspend = true,
@@ -216,7 +216,7 @@
  module_usb_driver(rt2500usb_driver);
 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -1314,7 +1314,9 @@ static struct usb_driver rt2800usb_drive
+@@ -1375,7 +1375,9 @@ static struct usb_driver rt2800usb_drive
  	.suspend	= rt2x00usb_suspend,
  	.resume		= rt2x00usb_resume,
  	.reset_resume	= rt2x00usb_resume,