compat-drivers: refresh patches

Refreshes patches for next-20130108

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

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

@@ -120,7 +120,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
-@@ -357,8 +357,10 @@ static const struct file_operations rade
+@@ -358,8 +358,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 |
@@ -133,7 +133,7 @@ not < 3.3.0.
  	.dev_priv_size = 0,
  	.load = radeon_driver_load_kms,
  	.firstopen = radeon_driver_firstopen_kms,
-@@ -393,10 +395,12 @@ static struct drm_driver kms_driver = {
+@@ -394,10 +396,12 @@ static struct drm_driver kms_driver = {
  	.dumb_destroy = radeon_mode_dumb_destroy,
  	.fops = &radeon_driver_kms_fops,
 
@@ -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);
-@@ -3793,8 +3795,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3787,8 +3789,10 @@ void i915_gem_free_object(struct drm_gem
 
  	BUG_ON(obj->pages);
 

patches/collateral-evolutions/drm/06-rename-config-options.patch

@@ -174,7 +174,7 @@
  CFLAGS_radeon_trace_points.o := -I$(src)
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -229,7 +229,7 @@ static struct pci_device_id pciidlist[]
+@@ -230,7 +230,7 @@ static struct pci_device_id pciidlist[]
  	radeon_PCI_IDS
  };
 
@@ -183,7 +183,7 @@
  MODULE_DEVICE_TABLE(pci, pciidlist);
  #endif
 
-@@ -443,7 +443,7 @@ static int __init radeon_init(void)
+@@ -444,7 +444,7 @@ static int __init radeon_init(void)
  #endif
  	/* if enabled by default */
  	if (radeon_modeset == -1) {

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
-@@ -3926,9 +3926,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3920,9 +3920,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
-@@ -1639,7 +1639,14 @@ i915_gem_object_truncate(struct drm_i915
+@@ -1645,7 +1645,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

@@ -146,7 +146,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
 
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1606,7 +1606,7 @@ static const struct net_device_ops hwsim
+@@ -1628,7 +1628,7 @@ static const struct net_device_ops hwsim
 
  static void hwsim_mon_setup(struct net_device *dev)
  {
@@ -190,7 +190,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	atl1e_set_ethtool_ops(netdev);
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2416,7 +2416,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2415,7 +2415,7 @@ static int atl1c_init_netdev(struct net_
  	SET_NETDEV_DEV(netdev, &pdev->dev);
  	pci_set_drvdata(pdev, netdev);
 
@@ -223,7 +223,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1053,7 +1053,7 @@ static void ieee80211_if_setup(struct ne
+@@ -1047,7 +1047,7 @@ static void ieee80211_if_setup(struct ne
  {
  	ether_setup(dev);
  	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -232,7 +232,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	dev->destructor = free_netdev;
  }
 
-@@ -1216,7 +1216,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1210,7 +1210,7 @@ static void ieee80211_setup_sdata(struct
 
  	/* only monitor/p2p-device differ */
  	if (sdata->dev) {
@@ -241,7 +241,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  		sdata->dev->type = ARPHRD_ETHER;
  	}
 
-@@ -1251,7 +1251,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1248,7 +1248,7 @@ static void ieee80211_setup_sdata(struct
  		break;
  	case NL80211_IFTYPE_MONITOR:
  		sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;

patches/collateral-evolutions/network/0002-net-misc.patch

@@ -22,7 +22,7 @@ compile tested against older kernels.
  	 * For RX we handle drivers that zero-pad to end-of-packet.
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1054,6 +1054,11 @@ static void ieee80211_if_setup(struct ne
+@@ -1048,6 +1048,11 @@ static void ieee80211_if_setup(struct ne
  	ether_setup(dev);
  	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
  	netdev_attach_ops(dev, &ieee80211_dataif_ops);

patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch

@@ -4,15 +4,15 @@ could be used.
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1538,6 +1538,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1548,6 +1548,7 @@ int ieee80211_if_add(struct ieee80211_lo
  			return -ENOMEM;
  		dev_net_set(ndev, wiphy_net(local->hw.wiphy));
 
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
  		ndev->needed_headroom = local->tx_headroom +
  					4*6 /* four MAC addresses */
  					+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1546,6 +1547,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1556,6 +1557,7 @@ int ieee80211_if_add(struct ieee80211_lo
  					- ETH_HLEN /* ethernet hard_header_len */
  					+ IEEE80211_ENCRYPT_HEADROOM;
  		ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;

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
-@@ -1930,10 +1930,10 @@ static int hwsim_register_received_nl(st
+@@ -1952,10 +1952,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:
-@@ -1970,7 +1970,7 @@ static int mac80211_hwsim_netlink_notify
+@@ -1992,7 +1992,7 @@ static int mac80211_hwsim_netlink_notify
  	if (state != NETLINK_URELEASE)
  		return NOTIFY_DONE;
 
@@ -138,7 +138,7 @@ this one should other drivers / subsystem need this change.
  				 rdev, dev, mac_addr, &sinfo) < 0) {
  		nlmsg_free(msg);
  		return -ENOBUFS;
-@@ -3534,7 +3534,7 @@ static int nl80211_dump_mpath(struct sk_
+@@ -3552,7 +3552,7 @@ static int nl80211_dump_mpath(struct sk_
  		if (err)
  			goto out_err;
 
@@ -147,7 +147,7 @@ this one should other drivers / subsystem need this change.
  				       cb->nlh->nlmsg_seq, NLM_F_MULTI,
  				       netdev, dst, next_hop,
  				       &pinfo) < 0)
-@@ -3583,7 +3583,7 @@ static int nl80211_get_mpath(struct sk_b
+@@ -3601,7 +3601,7 @@ static int nl80211_get_mpath(struct sk_b
  	if (!msg)
  		return -ENOMEM;
 
@@ -156,7 +156,7 @@ this one should other drivers / subsystem need this change.
  				 dev, dst, next_hop, &pinfo) < 0) {
  		nlmsg_free(msg);
  		return -ENOBUFS;
-@@ -3851,7 +3851,7 @@ static int nl80211_get_mesh_config(struc
+@@ -3865,7 +3865,7 @@ static int nl80211_get_mesh_config(struc
  	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
  	if (!msg)
  		return -ENOMEM;
@@ -165,7 +165,7 @@ this one should other drivers / subsystem need this change.
  			     NL80211_CMD_GET_MESH_CONFIG);
  	if (!hdr)
  		goto out;
-@@ -4169,7 +4169,7 @@ static int nl80211_get_reg(struct sk_buf
+@@ -4184,7 +4184,7 @@ static int nl80211_get_reg(struct sk_buf
  		goto out;
  	}
 
@@ -174,7 +174,7 @@ this one should other drivers / subsystem need this change.
  			     NL80211_CMD_GET_REG);
  	if (!hdr)
  		goto put_failure;
-@@ -4814,7 +4814,7 @@ static int nl80211_send_bss(struct sk_bu
+@@ -4822,7 +4822,7 @@ static int nl80211_send_bss(struct sk_bu
 
  	ASSERT_WDEV_LOCK(wdev);
 
@@ -183,7 +183,7 @@ this one should other drivers / subsystem need this change.
  			     NL80211_CMD_NEW_SCAN_RESULTS);
  	if (!hdr)
  		return -1;
-@@ -5041,7 +5041,7 @@ static int nl80211_dump_survey(struct sk
+@@ -5049,7 +5049,7 @@ static int nl80211_dump_survey(struct sk
  		}
 
  		if (nl80211_send_survey(skb,
@@ -192,7 +192,7 @@ this one should other drivers / subsystem need this change.
  				cb->nlh->nlmsg_seq, NLM_F_MULTI,
  				netdev,
  				&survey) < 0)
-@@ -5687,7 +5687,7 @@ static int nl80211_testmode_dump(struct
+@@ -5695,7 +5695,7 @@ static int nl80211_testmode_dump(struct
  	}
 
  	while (1) {
@@ -201,7 +201,7 @@ this one should other drivers / subsystem need this change.
  					   cb->nlh->nlmsg_seq, NLM_F_MULTI,
  					   NL80211_CMD_TESTMODE);
  		struct nlattr *tmdata;
-@@ -5766,7 +5766,7 @@ struct sk_buff *cfg80211_testmode_alloc_
+@@ -5774,7 +5774,7 @@ struct sk_buff *cfg80211_testmode_alloc_
  		return NULL;
 
  	return __cfg80211_testmode_alloc_skb(rdev, approxlen,
@@ -210,7 +210,7 @@ this one should other drivers / subsystem need this change.
  				rdev->testmode_info->snd_seq,
  				GFP_KERNEL);
  }
-@@ -6099,7 +6099,7 @@ static int nl80211_remain_on_channel(str
+@@ -6107,7 +6107,7 @@ static int nl80211_remain_on_channel(str
  	if (!msg)
  		return -ENOMEM;
 
@@ -219,7 +219,7 @@ this one should other drivers / subsystem need this change.
  			     NL80211_CMD_REMAIN_ON_CHANNEL);
 
  	if (IS_ERR(hdr)) {
-@@ -6318,7 +6318,7 @@ static int nl80211_register_mgmt(struct
+@@ -6326,7 +6326,7 @@ static int nl80211_register_mgmt(struct
  	if (!rdev->ops->mgmt_tx)
  		return -EOPNOTSUPP;
 
@@ -228,7 +228,7 @@ this one should other drivers / subsystem need this change.
  			nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]),
  			nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH]));
  }
-@@ -6388,7 +6388,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -6396,7 +6396,7 @@ static int nl80211_tx_mgmt(struct sk_buf
  		if (!msg)
  			return -ENOMEM;
 
@@ -237,7 +237,7 @@ this one should other drivers / subsystem need this change.
  				     NL80211_CMD_FRAME);
 
  		if (IS_ERR(hdr)) {
-@@ -6503,7 +6503,7 @@ static int nl80211_get_power_save(struct
+@@ -6511,7 +6511,7 @@ static int nl80211_get_power_save(struct
  	if (!msg)
  		return -ENOMEM;
 
@@ -246,7 +246,7 @@ this one should other drivers / subsystem need this change.
  			     NL80211_CMD_GET_POWER_SAVE);
  	if (!hdr) {
  		err = -ENOBUFS;
-@@ -6693,7 +6693,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -6701,7 +6701,7 @@ static int nl80211_get_wowlan(struct sk_
  	if (!msg)
  		return -ENOMEM;
 
@@ -255,7 +255,7 @@ this one should other drivers / subsystem need this change.
  			     NL80211_CMD_GET_WOWLAN);
  	if (!hdr)
  		goto nla_put_failure;
-@@ -6970,7 +6970,7 @@ static int nl80211_register_unexpected_f
+@@ -6978,7 +6978,7 @@ static int nl80211_register_unexpected_f
  	if (wdev->ap_unexpected_nlportid)
  		return -EBUSY;
 
@@ -264,7 +264,7 @@ this one should other drivers / subsystem need this change.
  	return 0;
  }
 
-@@ -7000,7 +7000,7 @@ static int nl80211_probe_client(struct s
+@@ -7008,7 +7008,7 @@ static int nl80211_probe_client(struct s
  	if (!msg)
  		return -ENOMEM;
 
@@ -273,7 +273,7 @@ this one should other drivers / subsystem need this change.
  			     NL80211_CMD_PROBE_CLIENT);
 
  	if (IS_ERR(hdr)) {
-@@ -7044,13 +7044,13 @@ static int nl80211_register_beacons(stru
+@@ -7052,13 +7052,13 @@ static int nl80211_register_beacons(stru
  	/* First, check if already registered. */
  	spin_lock_bh(&rdev->beacon_registrations_lock);
  	list_for_each_entry(reg, &rdev->beacon_registrations, list) {
@@ -289,7 +289,7 @@ this one should other drivers / subsystem need this change.
  	list_add(&nreg->list, &rdev->beacon_registrations);
 
  	spin_unlock_bh(&rdev->beacon_registrations_lock);
-@@ -9178,12 +9178,12 @@ static int nl80211_netlink_notify(struct
+@@ -9186,12 +9186,12 @@ 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)

patches/collateral-evolutions/network/03-rfkill.patch

@@ -44,7 +44,7 @@ This would do the policing from within mac80211.
  obj-$(CONFIG_RFKILL_GPIO)	+= rfkill-gpio.o
 --- a/net/rfkill/input.c
 +++ b/net/rfkill/input.c
-@@ -232,7 +232,7 @@ static int rfkill_connect(struct input_h
+@@ -230,7 +230,7 @@ static int rfkill_connect(struct input_h
 
  	handle->dev = dev;
  	handle->handler = handler;

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

@@ -6,7 +6,7 @@ files...
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -5950,7 +5950,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5958,7 +5958,9 @@ static int nl80211_wiphy_netns(struct sk
  	if (!net_eq(wiphy_net(&rdev->wiphy), net))
  		err = cfg80211_switch_netns(rdev, net);
 
@@ -18,23 +18,23 @@ files...
 
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
-@@ -168,6 +168,7 @@ int cfg80211_dev_rename(struct cfg80211_
+@@ -160,6 +160,7 @@ int cfg80211_dev_rename(struct cfg80211_
  	return 0;
  }
 
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
  int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
  			  struct net *net)
  {
-@@ -212,6 +213,7 @@ int cfg80211_switch_netns(struct cfg8021
+@@ -204,6 +205,7 @@ int cfg80211_switch_netns(struct cfg8021
 
  	return 0;
  }
 +#endif
 
  static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data)
  {
-@@ -344,7 +346,9 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -336,7 +338,9 @@ struct wiphy *wiphy_new(const struct cfg
  	rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
  #endif
 
@@ -44,7 +44,7 @@ files...
 
  	rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block;
  	rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev),
-@@ -843,8 +847,10 @@ static int cfg80211_netdev_notifier_call
+@@ -835,8 +839,10 @@ static int cfg80211_netdev_notifier_call
  		wdev->identifier = ++rdev->wdev_id;
  		list_add_rcu(&wdev->list, &rdev->wdev_list);
  		rdev->devlist_generation++;
@@ -55,15 +55,15 @@ files...
 
  		if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
  				      "phy80211")) {
-@@ -1035,6 +1041,7 @@ static struct notifier_block cfg80211_ne
+@@ -1027,6 +1033,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;
-@@ -1052,14 +1059,17 @@ static void __net_exit cfg80211_pernet_e
+@@ -1044,14 +1051,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)
-@@ -1094,8 +1104,10 @@ out_fail_nl80211:
+@@ -1086,8 +1096,10 @@ out_fail_nl80211:
  out_fail_notifier:
  	wiphy_sysfs_exit();
  out_fail_sysfs:
@@ -92,7 +92,7 @@ files...
  	return err;
  }
  subsys_initcall(cfg80211_init);
-@@ -1107,7 +1119,9 @@ static void __exit cfg80211_exit(void)
+@@ -1099,7 +1111,9 @@ static void __exit cfg80211_exit(void)
  	unregister_netdevice_notifier(&cfg80211_netdev_notifier);
  	wiphy_sysfs_exit();
  	regulatory_exit();