[PATCH for 3.7 0/6] compat-drivers: fixes for linux-3.7.y

[PATCH for 3.7 0/6] compat-drivers: fixes for linux-3.7.y

[Hauke Mehrtens]

This are some backports and patch refreshes for the linux-3.7.y branch.

Hauke Mehrtens (4):
  compat-drivers: rename drm config symbols
  compat-drivers: refresh patches
  compat-drivers: refresh patches
  compat-drivers: move disable_drm

Luis R. Rodriguez (2):
  compat-drivers: add disable_drm to driver-select
  compat-drivers: disable DRM drivers for 802.11 drivers

 patches/drm/04-revert-prime-support.patch          |   12 +-
 patches/drm/06-rename-config-options.patch         |  138 ++++++++++++++++++++
 patches/drm/07-intel-gtt.patch                     |    2 +-
 patches/network/0001-netdev_ops.patch              |    6 +-
 patches/network/0002-net-misc.patch                |    2 +-
 patches/network/04-netns.patch                     |    8 +-
 patches/network/05-usb.patch                       |    2 +-
 patches/network/09-threaded-irq.patch              |    8 +-
 patches/network/11-dev-pm-ops.patch                |    2 +-
 patches/network/16-bluetooth.patch                 |    4 +-
 patches/network/17-netdev-queue.patch              |    4 +-
 patches/network/25-multicast-list_head.patch       |    6 +-
 patches/network/48-use_skb_get_queue_mapping.patch |    4 +-
 patches/network/62-usb_driver_lpm.patch            |    6 +-
 scripts/driver-select                              |    7 +
 15 files changed, 178 insertions(+), 33 deletions(-)

-- 
1.7.10.4

[PATCH for 3.7 1/6] compat-drivers: rename drm config symbols

[Hauke Mehrtens]

Upstream commit af9229d68cf5ada80fbf94da169af56c3419ab3c

When config symbols are renamed they should be renamed at all places
and not just at some places.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
 patches/drm/06-rename-config-options.patch |  138 ++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/patches/drm/06-rename-config-options.patch b/patches/drm/06-rename-config-options.patch
index 1096fce..3b8e78e 100644
--- a/patches/drm/06-rename-config-options.patch
+++ b/patches/drm/06-rename-config-options.patch
@@ -63,6 +63,42 @@
 +obj-$(CONFIG_COMPAT_DRM_AST) += ast/
 +obj-$(CONFIG_COMPAT_DRM_SHMOBILE) +=shmobile/
  obj-y			+= i2c/
+--- a/drivers/gpu/drm/ast/Makefile
++++ b/drivers/gpu/drm/ast/Makefile
+@@ -6,4 +6,4 @@ ccflags-y := -Iinclude/drm
+ 
+ ast-y := ast_drv.o ast_main.o ast_mode.o ast_fb.o ast_ttm.o ast_post.o
+ 
+-obj-$(CONFIG_DRM_AST) := ast.o
+\ No newline at end of file
++obj-$(CONFIG_COMPAT_DRM_AST) := ast.o
+--- a/drivers/gpu/drm/cirrus/Makefile
++++ b/drivers/gpu/drm/cirrus/Makefile
+@@ -2,4 +2,4 @@ ccflags-y := -Iinclude/drm
+ cirrus-y  := cirrus_main.o cirrus_mode.o \
+ 	cirrus_drv.o cirrus_fbdev.o cirrus_ttm.o
+ 
+-obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o
++obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus.o
+--- a/drivers/gpu/drm/drm_crtc_helper.c
++++ b/drivers/gpu/drm/drm_crtc_helper.c
+@@ -119,7 +119,7 @@ int drm_helper_probe_single_connector_mo
+ 		goto prune;
+ 	}
+ 
+-#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
++#ifdef CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE
+ 	count = drm_load_edid_firmware(connector);
+ 	if (count == 0)
+ #endif
+--- a/drivers/gpu/drm/gma500/Makefile
++++ b/drivers/gpu/drm/gma500/Makefile
+@@ -49,4 +49,4 @@ gma500_gfx-$(CONFIG_DRM_MEDFIELD) += mdf
+ 	  mdfld_tmd_vid.o \
+ 	  tc35876x-dsi-lvds.o
+ 
+-obj-$(CONFIG_DRM_GMA500) += gma500_gfx.o
++obj-$(CONFIG_COMPAT_DRM_GMA500) += gma500_gfx.o
 --- a/drivers/gpu/drm/i2c/Makefile
 +++ b/drivers/gpu/drm/i2c/Makefile
 @@ -1,7 +1,7 @@
@@ -75,3 +111,105 @@
  sil164-y := sil164_drv.o
 -obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
 +obj-$(CONFIG_COMPAT_DRM_I2C_SIL164) += sil164.o
+--- a/drivers/gpu/drm/i810/Makefile
++++ b/drivers/gpu/drm/i810/Makefile
+@@ -5,4 +5,4 @@
+ ccflags-y := -Iinclude/drm
+ i810-y := i810_drv.o i810_dma.o
+ 
+-obj-$(CONFIG_DRM_I810)	+= i810.o
++obj-$(CONFIG_COMPAT_DRM_I810)	+= i810.o
+--- a/drivers/gpu/drm/i915/Makefile
++++ b/drivers/gpu/drm/i915/Makefile
+@@ -47,6 +47,6 @@ i915-$(CONFIG_COMPAT)   += i915_ioc32.o
+ 
+ i915-$(CONFIG_ACPI)	+= intel_acpi.o
+ 
+-obj-$(CONFIG_DRM_I915)  += i915.o
++obj-$(CONFIG_COMPAT_DRM_I915)  += i915.o
+ 
+ CFLAGS_i915_trace_points.o := -I$(src)
+--- a/drivers/gpu/drm/mgag200/Makefile
++++ b/drivers/gpu/drm/mgag200/Makefile
+@@ -2,4 +2,4 @@ ccflags-y := -Iinclude/drm
+ mgag200-y   := mgag200_main.o mgag200_mode.o \
+ 	mgag200_drv.o mgag200_fb.o mgag200_i2c.o mgag200_ttm.o
+ 
+-obj-$(CONFIG_DRM_MGAG200) += mgag200.o
++obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200.o
+--- a/drivers/gpu/drm/nouveau/Makefile
++++ b/drivers/gpu/drm/nouveau/Makefile
+@@ -187,6 +187,6 @@ nouveau-y += nouveau_mem.o
+ # other random bits
+ nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
+ nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
+-nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
++nouveau-$(CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
+ 
+-obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
++obj-$(CONFIG_COMPAT_DRM_NOUVEAU)+= nouveau.o
+--- a/drivers/gpu/drm/nouveau/nouveau_display.h
++++ b/drivers/gpu/drm/nouveau/nouveau_display.h
+@@ -76,7 +76,7 @@ int  nouveau_display_dumb_destroy(struct
+ 
+ void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
+ 
+-#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
++#ifdef CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT
+ extern int nouveau_backlight_init(struct drm_device *);
+ extern void nouveau_backlight_exit(struct drm_device *);
+ #else
+--- a/drivers/gpu/drm/radeon/Makefile
++++ b/drivers/gpu/drm/radeon/Makefile
+@@ -78,6 +78,6 @@ radeon-$(CONFIG_COMPAT) += radeon_ioc32.
+ radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o
+ radeon-$(CONFIG_ACPI) += radeon_acpi.o
+ 
+-obj-$(CONFIG_DRM_RADEON)+= radeon.o
++obj-$(CONFIG_COMPAT_DRM_RADEON)+= radeon.o
+ 
+ CFLAGS_radeon_trace_points.o := -I$(src)
+--- a/drivers/gpu/drm/radeon/radeon_drv.c
++++ b/drivers/gpu/drm/radeon/radeon_drv.c
+@@ -226,7 +226,7 @@ static struct pci_device_id pciidlist[]
+ 	radeon_PCI_IDS
+ };
+ 
+-#if defined(CONFIG_DRM_RADEON_KMS)
++#if defined(CONFIG_COMPAT_DRM_RADEON_KMS)
+ MODULE_DEVICE_TABLE(pci, pciidlist);
+ #endif
+ 
+@@ -431,7 +431,7 @@ static int __init radeon_init(void)
+ #endif
+ 	/* if enabled by default */
+ 	if (radeon_modeset == -1) {
+-#ifdef CONFIG_DRM_RADEON_KMS
++#ifdef CONFIG_COMPAT_DRM_RADEON_KMS
+ 		DRM_INFO("radeon defaulting to kernel modesetting.\n");
+ 		radeon_modeset = 1;
+ #else
+--- a/drivers/gpu/drm/ttm/Makefile
++++ b/drivers/gpu/drm/ttm/Makefile
+@@ -11,4 +11,4 @@ ifeq ($(CONFIG_SWIOTLB),y)
+ ttm-y += ttm_page_alloc_dma.o
+ endif
+ 
+-obj-$(CONFIG_DRM_TTM) += ttm.o
++obj-$(CONFIG_COMPAT_DRM_TTM) += ttm.o
+--- a/drivers/gpu/drm/via/Makefile
++++ b/drivers/gpu/drm/via/Makefile
+@@ -5,4 +5,4 @@
+ ccflags-y := -Iinclude/drm
+ via-y    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
+ 
+-obj-$(CONFIG_DRM_VIA)	+=via.o
++obj-$(CONFIG_COMPAT_DRM_VIA)	+=via.o
+--- a/drivers/gpu/drm/vmwgfx/Makefile
++++ b/drivers/gpu/drm/vmwgfx/Makefile
+@@ -7,4 +7,4 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.
+ 	    vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \
+ 	    vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o
+ 
+-obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o
++obj-$(CONFIG_COMPAT_DRM_VMWGFX) := vmwgfx.o
-- 
1.7.10.4

[PATCH for 3.7 2/6] compat-drivers: refresh patches

[Hauke Mehrtens]

refreshes patches based on linux 3.7.6.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/drm/04-revert-prime-support.patch          |    8 ++++----
 patches/drm/07-intel-gtt.patch                     |    2 +-
 patches/network/0001-netdev_ops.patch              |    6 +++---
 patches/network/0002-net-misc.patch                |    2 +-
 patches/network/05-usb.patch                       |    2 +-
 patches/network/09-threaded-irq.patch              |    8 ++++----
 patches/network/11-dev-pm-ops.patch                |    2 +-
 patches/network/16-bluetooth.patch                 |    4 ++--
 patches/network/17-netdev-queue.patch              |    4 ++--
 patches/network/25-multicast-list_head.patch       |    6 +++---
 patches/network/48-use_skb_get_queue_mapping.patch |    4 ++--
 patches/network/62-usb_driver_lpm.patch            |    6 +++---
 12 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch
index 28db7a3..66f7ec0 100644
--- a/patches/drm/04-revert-prime-support.patch
+++ b/patches/drm/04-revert-prime-support.patch
@@ -97,7 +97,7 @@ not < 3.3.0.
  #include <drm/drmP.h>
  
  #include "nouveau_drm.h"
-@@ -228,4 +229,4 @@ fail_detach:
+@@ -229,4 +230,4 @@ fail_detach:
  	dma_buf_detach(dma_buf, attach);
  	return ERR_PTR(ret);
  }
@@ -113,7 +113,7 @@ not < 3.3.0.
  #include <drm/drmP.h>
  
  #include "radeon.h"
-@@ -225,3 +226,4 @@ fail_detach:
+@@ -226,3 +227,4 @@ fail_detach:
  	dma_buf_detach(dma_buf, attach);
  	return ERR_PTR(ret);
  }
@@ -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);
-@@ -3776,8 +3778,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3784,8 +3786,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>
-@@ -302,3 +303,4 @@ fail_detach:
+@@ -307,3 +308,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 62df61c..fc8fd22 100644
--- 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
-@@ -3971,8 +3971,10 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -3979,8 +3979,10 @@ i915_gem_init_hw(struct drm_device *dev)
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	int ret;
  
diff --git a/patches/network/0001-netdev_ops.patch b/patches/network/0001-netdev_ops.patch
index 45a2d1f..83db7de 100644
--- a/patches/network/0001-netdev_ops.patch
+++ b/patches/network/0001-netdev_ops.patch
@@ -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
-@@ -987,7 +987,7 @@ static void ieee80211_if_setup(struct ne
+@@ -978,7 +978,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;
  }
  
-@@ -1143,7 +1143,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1134,7 +1134,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;
  	}
  
-@@ -1177,7 +1177,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1168,7 +1168,7 @@ static void ieee80211_setup_sdata(struct
  		break;
  	case NL80211_IFTYPE_MONITOR:
  		sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
diff --git a/patches/network/0002-net-misc.patch b/patches/network/0002-net-misc.patch
index 35a2f9f..4e10918 100644
--- a/patches/network/0002-net-misc.patch
+++ b/patches/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
-@@ -988,6 +988,11 @@ static void ieee80211_if_setup(struct ne
+@@ -979,6 +979,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);
diff --git a/patches/network/05-usb.patch b/patches/network/05-usb.patch
index 57471ca..16d7d8a 100644
--- a/patches/network/05-usb.patch
+++ b/patches/network/05-usb.patch
@@ -2,7 +2,7 @@ USB opt soft_unbid was added as of 2.6.27.
 
 --- a/drivers/net/wireless/p54/p54usb.c
 +++ b/drivers/net/wireless/p54/p54usb.c
-@@ -1139,7 +1139,9 @@ static struct usb_driver p54u_driver = {
+@@ -1143,7 +1143,9 @@ static struct usb_driver p54u_driver = {
  	.resume = p54u_resume,
  	.reset_resume = p54u_resume,
  #endif /* CONFIG_PM */
diff --git a/patches/network/09-threaded-irq.patch b/patches/network/09-threaded-irq.patch
index 929d527..1ff54c7 100644
--- a/patches/network/09-threaded-irq.patch
+++ b/patches/network/09-threaded-irq.patch
@@ -6,7 +6,7 @@ thread in process context as well.
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -4212,8 +4212,13 @@ redo:
+@@ -4240,8 +4240,13 @@ redo:
  	if (b43_bus_host_is_sdio(dev->dev)) {
  		b43_sdio_free_irq(dev);
  	} else {
@@ -20,7 +20,7 @@ thread in process context as well.
  	}
  	mutex_lock(&wl->mutex);
  	dev = wl->current_dev;
-@@ -4255,9 +4260,17 @@ static int b43_wireless_core_start(struc
+@@ -4287,9 +4292,17 @@ static int b43_wireless_core_start(struc
  			goto out;
  		}
  	} else {
@@ -38,7 +38,7 @@ thread in process context as well.
  		if (err) {
  			b43err(dev->wl, "Cannot request IRQ-%d\n",
  			       dev->dev->irq);
-@@ -5080,6 +5093,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5112,6 +5125,10 @@ static int b43_setup_bands(struct b43_wl
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {
@@ -51,7 +51,7 @@ thread in process context as well.
  	b43_release_firmware(dev);
 --- a/drivers/net/wireless/b43/b43.h
 +++ b/drivers/net/wireless/b43/b43.h
-@@ -859,6 +859,9 @@ struct b43_wldev {
+@@ -864,6 +864,9 @@ struct b43_wldev {
  	unsigned int tx_count;
  	unsigned int rx_count;
  #endif
diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch
index 6725f80..acc9c62 100644
--- a/patches/network/11-dev-pm-ops.patch
+++ b/patches/network/11-dev-pm-ops.patch
@@ -173,7 +173,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
-@@ -4906,8 +4906,17 @@ il_pci_resume(struct device *device)
+@@ -4899,8 +4899,17 @@ il_pci_resume(struct device *device)
  	return 0;
  }
  
diff --git a/patches/network/16-bluetooth.patch b/patches/network/16-bluetooth.patch
index a4b6276..419357b 100644
--- a/patches/network/16-bluetooth.patch
+++ b/patches/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
-@@ -432,8 +432,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;
  
-@@ -662,7 +666,11 @@ static int sco_sock_sendmsg(struct kiocb
+@@ -653,7 +657,11 @@ static int sco_sock_sendmsg(struct kiocb
  	return err;
  }
  
diff --git a/patches/network/17-netdev-queue.patch b/patches/network/17-netdev-queue.patch
index 6b10765..3df62f9 100644
--- a/patches/network/17-netdev-queue.patch
+++ b/patches/network/17-netdev-queue.patch
@@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was:
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1589,6 +1589,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1593,6 +1593,7 @@ void ieee80211_sdata_stop(struct ieee802
   * Remove all interfaces, may only be called at hardware unregistration
   * time because it doesn't do RCU-safe list removals.
   */
@@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was:
  void ieee80211_remove_interfaces(struct ieee80211_local *local)
  {
  	struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1616,6 +1617,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1620,6 +1621,22 @@ void ieee80211_remove_interfaces(struct
  		kfree(sdata);
  	}
  }
diff --git a/patches/network/25-multicast-list_head.patch b/patches/network/25-multicast-list_head.patch
index bc1b808..7536ca5 100644
--- a/patches/network/25-multicast-list_head.patch
+++ b/patches/network/25-multicast-list_head.patch
@@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	}
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2343,7 +2343,11 @@ struct ieee80211_ops {
+@@ -2348,7 +2348,11 @@ struct ieee80211_ops {
  				 u32 changed);
  
  	u64 (*prepare_multicast)(struct ieee80211_hw *hw,
@@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -868,7 +868,12 @@ struct ieee80211_local {
+@@ -872,7 +872,12 @@ struct ieee80211_local {
  	struct work_struct recalc_smps;
  
  	/* aggregated multicast list */
@@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  		spin_unlock_bh(&local->filter_lock);
  		netif_addr_unlock_bh(sdata->dev);
  
-@@ -899,7 +904,12 @@ static void ieee80211_set_multicast_list
+@@ -890,7 +895,12 @@ static void ieee80211_set_multicast_list
  		sdata->flags ^= IEEE80211_SDATA_PROMISC;
  	}
  	spin_lock_bh(&local->filter_lock);
diff --git a/patches/network/48-use_skb_get_queue_mapping.patch b/patches/network/48-use_skb_get_queue_mapping.patch
index f27801d..5ed233b 100644
--- a/patches/network/48-use_skb_get_queue_mapping.patch
+++ b/patches/network/48-use_skb_get_queue_mapping.patch
@@ -4,7 +4,7 @@ function always returns something.
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -3424,11 +3424,11 @@ static void b43_op_tx(struct ieee80211_h
+@@ -3452,11 +3452,11 @@ static void b43_op_tx(struct ieee80211_h
  	}
  	B43_WARN_ON(skb_shinfo(skb)->nr_frags);
  
@@ -21,7 +21,7 @@ function always returns something.
  
 --- a/drivers/net/wireless/b43legacy/main.c
 +++ b/drivers/net/wireless/b43legacy/main.c
-@@ -2504,11 +2504,11 @@ static void b43legacy_op_tx(struct ieee8
+@@ -2529,11 +2529,11 @@ static void b43legacy_op_tx(struct ieee8
  	}
  	B43legacy_WARN_ON(skb_shinfo(skb)->nr_frags);
  
diff --git a/patches/network/62-usb_driver_lpm.patch b/patches/network/62-usb_driver_lpm.patch
index 1e34b68..b5e4ced 100644
--- a/patches/network/62-usb_driver_lpm.patch
+++ b/patches/network/62-usb_driver_lpm.patch
@@ -48,7 +48,7 @@
  module_usb_driver(bpa10x_driver);
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
-@@ -1223,7 +1223,9 @@ static struct usb_driver btusb_driver =
+@@ -1224,7 +1224,9 @@ static struct usb_driver btusb_driver =
  #endif
  	.id_table	= btusb_table,
  	.supports_autosuspend = 1,
@@ -60,7 +60,7 @@
  module_usb_driver(btusb_driver);
 --- a/drivers/net/usb/cdc_ether.c
 +++ b/drivers/net/usb/cdc_ether.c
-@@ -716,7 +716,9 @@ static struct usb_driver cdc_driver = {
+@@ -731,7 +731,9 @@ static struct usb_driver cdc_driver = {
  	.resume =	usbnet_resume,
  	.reset_resume =	usbnet_resume,
  	.supports_autosuspend = 1,
@@ -180,7 +180,7 @@
  module_usb_driver(orinoco_driver);
 --- a/drivers/net/wireless/p54/p54usb.c
 +++ b/drivers/net/wireless/p54/p54usb.c
-@@ -1142,7 +1142,9 @@ static struct usb_driver p54u_driver = {
+@@ -1146,7 +1146,9 @@ static struct usb_driver p54u_driver = {
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
  	.soft_unbind = 1,
  #endif
-- 
1.7.10.4

[PATCH for 3.7 3/6] compat-drivers: add disable_drm to driver-select

[Hauke Mehrtens]

From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>

Upstream commit 465d036de8310671c5ed6ad161276d30c05f952b

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
 scripts/driver-select |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/driver-select b/scripts/driver-select
index 885033f..e5cc177 100755
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -183,6 +183,10 @@ function disable_80211 {
 	perl -i -ne 'print if ! /CONFIG_COMPAT_WIRELESS/' Makefile
 }
 
+function disable_drm {
+	perl -i -ne 'print if ! /CONFIG_COMPAT_VIDEO_MODULES/' Makefile
+}
+
 function disable_bt_usb_ethernet {
 	backup_file Makefile
 	disable_usbnet
@@ -205,6 +209,7 @@ function enable_only_ethernet {
 	disable_usbnet
 	disable_var_03
 	disable_bt
+	disable_drm
 	# rfkill may be needed if you enable b44 as you may have b43
 	disable_rfkill
 	disable_80211
-- 
1.7.10.4

[PATCH for 3.7 4/6] compat-drivers: disable DRM drivers for 802.11 drivers

[Hauke Mehrtens]

From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>

Upstream commit 2371a496060c87378c27eb0cb33feeefbc29f2fc

When using driver-select disable DRM driver sfor 802.11 drivers.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 scripts/driver-select |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/driver-select b/scripts/driver-select
index e5cc177..033d7e5 100755
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -199,6 +199,7 @@ function disable_bt_usb_ethernet_var {
 	backup_file Makefile
 	disable_bt_usb_ethernet
 	disable_var_03
+	disable_drm
 }
 
 function enable_only_ethernet {
@@ -399,6 +400,7 @@ case $1 in
 		;;
 	ti)
 		select_drivers		CONFIG_WL_TI
+		disable_bt_usb_ethernet_var
 		disable_staging
 		disable_var_01
 		;;
-- 
1.7.10.4

[PATCH for 3.7 5/6] compat-drivers: refresh patches

[Hauke Mehrtens]

refreshes patches based on linux 3.7.9.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/drm/04-revert-prime-support.patch |    4 ++--
 patches/network/04-netns.patch            |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch
index 66f7ec0..7e41388 100644
--- a/patches/drm/04-revert-prime-support.patch
+++ b/patches/drm/04-revert-prime-support.patch
@@ -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
-@@ -590,7 +590,10 @@ driver = {
+@@ -593,7 +593,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,
-@@ -611,10 +614,12 @@ driver = {
+@@ -614,10 +617,12 @@ driver = {
  	.ioctls = nouveau_ioctls,
  	.fops = &nouveau_driver_fops,
  
diff --git a/patches/network/04-netns.patch b/patches/network/04-netns.patch
index 777ced3..38d4249 100644
--- a/patches/network/04-netns.patch
+++ b/patches/network/04-netns.patch
@@ -55,7 +55,7 @@ files...
  
  		if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
  				      "phy80211")) {
-@@ -1026,6 +1032,7 @@ static struct notifier_block cfg80211_ne
+@@ -1025,6 +1031,7 @@ static struct notifier_block cfg80211_ne
  	.notifier_call = cfg80211_netdev_notifier_call,
  };
  
@@ -63,7 +63,7 @@ files...
  static void __net_exit cfg80211_pernet_exit(struct net *net)
  {
  	struct cfg80211_registered_device *rdev;
-@@ -1043,14 +1050,17 @@ static void __net_exit cfg80211_pernet_e
+@@ -1042,14 +1049,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)
-@@ -1085,8 +1095,10 @@ out_fail_nl80211:
+@@ -1084,8 +1094,10 @@ out_fail_nl80211:
  out_fail_notifier:
  	wiphy_sysfs_exit();
  out_fail_sysfs:
@@ -92,7 +92,7 @@ files...
  	return err;
  }
  subsys_initcall(cfg80211_init);
-@@ -1098,7 +1110,9 @@ static void __exit cfg80211_exit(void)
+@@ -1097,7 +1109,9 @@ static void __exit cfg80211_exit(void)
  	unregister_netdevice_notifier(&cfg80211_netdev_notifier);
  	wiphy_sysfs_exit();
  	regulatory_exit();
-- 
1.7.10.4

[PATCH for 3.7 6/6] compat-drivers: move disable_drm

[Hauke Mehrtens]

Upstream commit 483aca89f39525a0d9bfcddade5beed19d659d7f

drm should be disabled when disable_bt_usb_ethernet is selected. This
disables drm also for e.g. b43.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 scripts/driver-select |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/driver-select b/scripts/driver-select
index 033d7e5..6eed37e 100755
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -193,13 +193,13 @@ function disable_bt_usb_ethernet {
 	disable_ethernet
 	disable_bt
 	disable_update-initramfs
+	disable_drm
 }
 
 function disable_bt_usb_ethernet_var {
 	backup_file Makefile
 	disable_bt_usb_ethernet
 	disable_var_03
-	disable_drm
 }
 
 function enable_only_ethernet {
-- 
1.7.10.4