compat-drivers: refresh patches for next-20130121

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

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
-@@ -1295,10 +1295,17 @@ i915_gem_mmap_ioctl(struct drm_device *d
+@@ -1292,10 +1292,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

@@ -21,7 +21,7 @@ not < 3.3.0.
  	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
-@@ -283,8 +283,10 @@ static int drm_open_helper(struct inode
+@@ -284,8 +284,10 @@ static int drm_open_helper(struct inode
  	if (dev->driver->driver_features & DRIVER_GEM)
  		drm_gem_open(dev, priv);
 
@@ -32,7 +32,7 @@ not < 3.3.0.
 
  	if (dev->driver->open) {
  		ret = dev->driver->open(dev, priv);
-@@ -537,8 +539,10 @@ int drm_release(struct inode *inode, str
+@@ -538,8 +540,10 @@ int drm_release(struct inode *inode, str
  	if (dev->driver->postclose)
  		dev->driver->postclose(dev, file_priv);
 
@@ -236,7 +236,7 @@ not < 3.3.0.
  	dev = drm->dev;
 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -622,7 +622,10 @@ driver = {
+@@ -627,7 +627,10 @@ driver = {
  	.driver_features =
  		DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
  		DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
@@ -248,7 +248,7 @@ not < 3.3.0.
 
  	.load = nouveau_drm_load,
  	.unload = nouveau_drm_unload,
-@@ -643,10 +646,12 @@ driver = {
+@@ -648,10 +651,12 @@ driver = {
  	.ioctls = nouveau_ioctls,
  	.fops = &nouveau_driver_fops,
 
@@ -286,7 +286,7 @@ not < 3.3.0.
 
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -1016,7 +1016,11 @@ static struct drm_driver driver = {
+@@ -1018,7 +1018,11 @@ static struct drm_driver driver = {
  	 */
  	.driver_features =
  	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
@@ -298,7 +298,7 @@ not < 3.3.0.
  	.load = i915_driver_load,
  	.unload = i915_driver_unload,
  	.open = i915_driver_open,
-@@ -1039,10 +1043,12 @@ static struct drm_driver driver = {
+@@ -1041,10 +1045,12 @@ static struct drm_driver driver = {
  	.gem_free_object = i915_gem_free_object,
  	.gem_vm_ops = &i915_gem_vm_ops,
 
@@ -323,7 +323,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);
-@@ -3787,8 +3789,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3819,8 +3821,10 @@ void i915_gem_free_object(struct drm_gem
 
  	BUG_ON(obj->pages);
 
@@ -344,7 +344,7 @@ not < 3.3.0.
  #include <drm/drmP.h>
  #include "i915_drv.h"
  #include <linux/dma-buf.h>
-@@ -307,3 +308,4 @@ fail_detach:
+@@ -306,3 +307,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
-@@ -3920,9 +3920,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3954,9 +3954,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
-@@ -1645,7 +1645,14 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1648,7 +1648,14 @@ i915_gem_object_truncate(struct drm_i915
  	 * backing pages, *now*.
  	 */
  	inode = obj->base.filp->f_path.dentry->d_inode;

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

@@ -93,7 +93,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	retval = rndis_set_oid(usbdev,
 --- a/drivers/net/ethernet/broadcom/b44.c
 +++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -2175,7 +2175,7 @@ static int b44_init_one(struct ssb_devic
+@@ -2173,7 +2173,7 @@ static int b44_init_one(struct ssb_devic
  	bp->rx_pending = B44_DEF_RX_RING_PENDING;
  	bp->tx_pending = B44_DEF_TX_RING_PENDING;
 
@@ -115,7 +115,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	priv->wireless_data.libipw = priv->ieee;
 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11688,7 +11688,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11687,7 +11687,7 @@ static int ipw_prom_alloc(struct ipw_pri
  	memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
 
  	priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -124,7 +124,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
 
  	priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
  	SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11826,7 +11826,7 @@ static int ipw_pci_probe(struct pci_dev
+@@ -11825,7 +11825,7 @@ static int ipw_pci_probe(struct pci_dev
  	priv->ieee->perfect_rssi = -20;
  	priv->ieee->worst_rssi = -85;
 
@@ -157,7 +157,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
 
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1667,7 +1667,7 @@ static const struct net_device_ops hwsim
+@@ -1688,7 +1688,7 @@ static const struct net_device_ops hwsim
 
  static void hwsim_mon_setup(struct net_device *dev)
  {

patches/collateral-evolutions/network/0005-netlink-portid.patch

@@ -42,7 +42,7 @@ this one should other drivers / subsystem need this change.
 
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1991,10 +1991,10 @@ static int hwsim_register_received_nl(st
+@@ -2012,10 +2012,10 @@ static int hwsim_register_received_nl(st
  	if (info == NULL)
  		goto out;
 
@@ -55,7 +55,7 @@ this one should other drivers / subsystem need this change.
 
  	return 0;
  out:
-@@ -2031,7 +2031,7 @@ static int mac80211_hwsim_netlink_notify
+@@ -2052,7 +2052,7 @@ static int mac80211_hwsim_netlink_notify
  	if (state != NETLINK_URELEASE)
  		return NOTIFY_DONE;
 

patches/collateral-evolutions/network/04-netns.patch

@@ -55,15 +55,15 @@ files...
 
  		if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
  				      "phy80211")) {
-@@ -1027,6 +1033,7 @@ static struct notifier_block cfg80211_ne
+@@ -1026,6 +1032,7 @@ static struct notifier_block cfg80211_ne
  	.notifier_call = cfg80211_netdev_notifier_call,
  };
 
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
  static void __net_exit cfg80211_pernet_exit(struct net *net)
  {
  	struct cfg80211_registered_device *rdev;
-@@ -1044,14 +1051,17 @@ static void __net_exit cfg80211_pernet_e
+@@ -1043,14 +1050,17 @@ static void __net_exit cfg80211_pernet_e
  static struct pernet_operations cfg80211_pernet_ops = {
  	.exit = cfg80211_pernet_exit,
  };
@@ -81,7 +81,7 @@ files...
 
  	err = wiphy_sysfs_init();
  	if (err)
-@@ -1086,8 +1096,10 @@ out_fail_nl80211:
+@@ -1085,8 +1095,10 @@ out_fail_nl80211:
  out_fail_notifier:
  	wiphy_sysfs_exit();
  out_fail_sysfs:
@@ -92,7 +92,7 @@ files...
  	return err;
  }
  subsys_initcall(cfg80211_init);
-@@ -1099,7 +1111,9 @@ static void __exit cfg80211_exit(void)
+@@ -1098,7 +1110,9 @@ static void __exit cfg80211_exit(void)
  	unregister_netdevice_notifier(&cfg80211_netdev_notifier);
  	wiphy_sysfs_exit();
  	regulatory_exit();

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

@@ -34,7 +34,7 @@ calls on compat code with only slight modifications.
  int __init bcma_host_pci_init(void)
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2689,6 +2689,9 @@ static const struct pci_error_handlers a
+@@ -2688,6 +2688,9 @@ static const struct pci_error_handlers a
  	.resume = atl1c_io_resume,
  };
 
@@ -44,7 +44,7 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
 
  static struct pci_driver atl1c_driver = {
-@@ -2698,7 +2701,12 @@ static struct pci_driver atl1c_driver =
+@@ -2697,7 +2700,12 @@ static struct pci_driver atl1c_driver =
  	.remove   = atl1c_remove,
  	.shutdown = atl1c_shutdown,
  	.err_handler = &atl1c_err_handler,

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

@@ -113,7 +113,7 @@ here still, but for now we keep this here.
 
 --- a/net/bluetooth/hci_sysfs.c
 +++ b/net/bluetooth/hci_sysfs.c
-@@ -71,7 +71,11 @@ static struct attribute_group bt_link_gr
+@@ -72,7 +72,11 @@ static struct attribute_group bt_link_gr
  	.attrs = bt_link_attrs,
  };
 
@@ -125,7 +125,7 @@ here still, but for now we keep this here.
  	&bt_link_group,
  	NULL
  };
-@@ -140,7 +144,11 @@ void hci_conn_del_sysfs(struct hci_conn
+@@ -141,7 +145,11 @@ void hci_conn_del_sysfs(struct hci_conn
  		dev = device_find_child(&conn->dev, NULL, __match_tty);
  		if (!dev)
  			break;
@@ -137,7 +137,7 @@ here still, but for now we keep this here.
  		put_device(dev);
  	}
 
-@@ -378,7 +386,11 @@ static struct attribute_group bt_host_gr
+@@ -379,7 +387,11 @@ static struct attribute_group bt_host_gr
  	.attrs = bt_host_attrs,
  };
 
@@ -399,7 +399,7 @@ here still, but for now we keep this here.
  	struct bt_security sec;
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -713,8 +713,12 @@ static int rfcomm_tty_open(struct tty_st
+@@ -708,8 +708,12 @@ static int rfcomm_tty_open(struct tty_st
  	remove_wait_queue(&dev->wait, &wait);
 
  	if (err == 0)
@@ -412,7 +412,7 @@ here still, but for now we keep this here.
 
  	rfcomm_tty_copy_pending(dev);
 
-@@ -738,7 +742,11 @@ static void rfcomm_tty_close(struct tty_
+@@ -733,7 +737,11 @@ static void rfcomm_tty_close(struct tty_
  	if (!--dev->port.count) {
  		spin_unlock_irqrestore(&dev->port.lock, flags);
  		if (dev->tty_dev->parent)
@@ -424,7 +424,7 @@ here still, but for now we keep this here.
 
  		/* Close DLC and dettach TTY */
  		rfcomm_dlc_close(dev->dlc, 0);
-@@ -814,7 +822,11 @@ static int rfcomm_tty_write_room(struct
+@@ -809,7 +817,11 @@ static int rfcomm_tty_write_room(struct
  	return room;
  }
 
@@ -436,7 +436,7 @@ here still, but for now we keep this here.
  {
  	BT_DBG("tty %p cmd 0x%02x", tty, cmd);
 
-@@ -1073,7 +1085,11 @@ static void rfcomm_tty_hangup(struct tty
+@@ -1068,7 +1080,11 @@ static void rfcomm_tty_hangup(struct tty
  	}
  }
 
@@ -448,7 +448,7 @@ here still, but for now we keep this here.
  {
  	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
 
-@@ -1082,7 +1098,11 @@ static int rfcomm_tty_tiocmget(struct tt
+@@ -1077,7 +1093,11 @@ static int rfcomm_tty_tiocmget(struct tt
  	return dev->modem_status;
  }
 

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

@@ -284,7 +284,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
 
  	/* Init PHY as early as possible due to power saving issue  */
  	atl2_phy_init(&adapter->hw);
-@@ -1848,6 +1856,13 @@ static int atl2_set_settings(struct net_
+@@ -1841,6 +1849,13 @@ static int atl2_set_settings(struct net_
  	return 0;
  }
 
@@ -298,7 +298,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static u32 atl2_get_msglevel(struct net_device *netdev)
  {
  	return 0;
-@@ -2117,6 +2132,14 @@ static const struct ethtool_ops atl2_eth
+@@ -2110,6 +2125,14 @@ static const struct ethtool_ops atl2_eth
  	.get_eeprom_len		= atl2_get_eeprom_len,
  	.get_eeprom		= atl2_get_eeprom,
  	.set_eeprom		= atl2_set_eeprom,

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
-@@ -1792,8 +1792,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1793,8 +1793,12 @@ 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/61-netdev-addr_assign_type.patch

@@ -16,7 +16,7 @@ v2.6.36-rc1~571^2~104
 +#endif
  	}
  	memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len);
- 	memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len);
+ 	if (netif_msg_probe(adapter))
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
 @@ -3060,7 +3060,9 @@ static int atl1_probe(struct pci_dev *pd

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

@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/ath3k.c
 +++ b/drivers/bluetooth/ath3k.c
-@@ -453,7 +453,9 @@ static struct usb_driver ath3k_driver =
+@@ -463,7 +463,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
-@@ -1224,7 +1224,9 @@ static struct usb_driver btusb_driver =
+@@ -1229,7 +1229,9 @@ static struct usb_driver btusb_driver =
  #endif
  	.id_table	= btusb_table,
  	.supports_autosuspend = 1,
@@ -72,7 +72,7 @@
  module_usb_driver(cdc_driver);
 --- a/drivers/net/usb/rndis_host.c
 +++ b/drivers/net/usb/rndis_host.c
-@@ -643,7 +643,9 @@ static struct usb_driver rndis_driver =
+@@ -642,7 +642,9 @@ static struct usb_driver rndis_driver =
  	.disconnect =	usbnet_disconnect,
  	.suspend =	usbnet_suspend,
  	.resume =	usbnet_resume,

patches/collateral-evolutions/network/63-tty-termios.patch

@@ -35,7 +35,7 @@ was not done through a static inline helper.
 
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -873,7 +873,11 @@ static int rfcomm_tty_ioctl(struct tty_s
+@@ -868,7 +868,11 @@ static int rfcomm_tty_ioctl(struct tty_s
 
  static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
  {

patches/collateral-evolutions/network/64-b44-32bit-stats.patch

@@ -40,7 +40,7 @@ Date:   Tue Jul 17 17:46:01 2012 +0000
  	struct b44_hw_stats *hwstat = &bp->hw_stats;
  	unsigned int start;
 
-@@ -2135,7 +2143,11 @@ static const struct net_device_ops b44_n
+@@ -2133,7 +2141,11 @@ static const struct net_device_ops b44_n
  	.ndo_open		= b44_open,
  	.ndo_stop		= b44_close,
  	.ndo_start_xmit		= b44_start_xmit,