From 95c1a7850f0b1292d9d8bfb5d848c30072b851ea Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 22 Aug 2012 20:47:29 +0400 Subject: [PATCH] compat-drivers: refresh patches for next-20120822 All I had to do was: ./scripts/admin-update.sh network drm refresh Signed-off-by: Luis R. Rodriguez --- patches/drm/01-dma_buf_ops-addition.patch | 20 ++-- patches/drm/02-revert-vm_mmap.patch | 24 ++-- patches/drm/03-swiotlb.patch | 20 ++-- patches/drm/04-revert-prime-support.patch | 108 +++++++----------- .../drm/05-i915-define-acpi-video-class.patch | 8 +- patches/drm/98-pr_fmt.patch | 72 ++++-------- patches/drm/99-change-makefile.patch | 6 +- patches/network/0001-netdev_ops.patch | 10 +- patches/network/0002-net-misc.patch | 2 +- patches/network/03-rfkill.patch | 2 +- patches/network/04-netns.patch | 14 +-- .../network/08-rename-config-options.patch | 4 +- .../network/09-cfg80211-wext-padding.patch | 4 +- patches/network/09-threaded-irq.patch | 14 +-- .../10-add-wext-handlers-to-netdev.patch | 4 +- patches/network/11-dev-pm-ops.patch | 4 +- patches/network/12-iw_handler-changes.patch | 2 +- .../12-mac80211-disable-tx-status.patch | 4 +- patches/network/14-device-type.patch | 4 +- .../network/15-symbol-export-conflicts.patch | 2 +- patches/network/16-bluetooth.patch | 28 ++--- patches/network/17-netdev-queue.patch | 8 +- patches/network/22-multiqueue.patch | 2 +- patches/network/24-pcmcia.patch | 36 +++--- patches/network/25-multicast-list_head.patch | 32 +++--- patches/network/29-sdio_no_suspend.patch | 10 +- patches/network/30-bridge-port.patch | 4 +- patches/network/36-workqueue.patch | 2 +- patches/network/42-netlink_seq.patch | 2 +- .../47-no_trans_start_on_netdev_queue.patch | 2 +- .../48-use_skb_get_queue_mapping.patch | 4 +- .../network/50-libertas-olpc-ec-wakeup.patch | 4 +- patches/network/62-usb_driver_lpm.patch | 20 ++-- 33 files changed, 204 insertions(+), 278 deletions(-) diff --git a/patches/drm/01-dma_buf_ops-addition.patch b/patches/drm/01-dma_buf_ops-addition.patch index ee95cb5faf7f..403116b7cea1 100644 --- a/patches/drm/01-dma_buf_ops-addition.patch +++ b/patches/drm/01-dma_buf_ops-addition.patch @@ -4,10 +4,8 @@ if kernel version >= 3.5.0 as they are added in 3.5. Note that the dma-buf itself was added with 3.4. It is not available on kernels < 3.4. -Index: compat-drm/drivers/gpu/drm/i915/i915_gem_dmabuf.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/i915_gem_dmabuf.c -+++ compat-drm/drivers/gpu/drm/i915/i915_gem_dmabuf.c +--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c ++++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -159,9 +159,11 @@ static const struct dma_buf_ops i915_dma .kmap_atomic = i915_gem_dmabuf_kmap_atomic, .kunmap = i915_gem_dmabuf_kunmap, @@ -20,11 +18,9 @@ Index: compat-drm/drivers/gpu/drm/i915/i915_gem_dmabuf.c }; struct dma_buf *i915_gem_prime_export(struct drm_device *dev, -Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/nouveau/nouveau_prime.c -+++ compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c -@@ -111,9 +111,11 @@ static const struct dma_buf_ops nouveau_ +--- a/drivers/gpu/drm/nouveau/nouveau_prime.c ++++ b/drivers/gpu/drm/nouveau/nouveau_prime.c +@@ -134,9 +134,11 @@ static const struct dma_buf_ops nouveau_ .kmap_atomic = nouveau_gem_kmap_atomic, .kunmap = nouveau_gem_kunmap, .kunmap_atomic = nouveau_gem_kunmap_atomic, @@ -36,10 +32,8 @@ Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c }; static int -Index: compat-drm/drivers/gpu/drm/radeon/radeon_prime.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/radeon/radeon_prime.c -+++ compat-drm/drivers/gpu/drm/radeon/radeon_prime.c +--- a/drivers/gpu/drm/radeon/radeon_prime.c ++++ b/drivers/gpu/drm/radeon/radeon_prime.c @@ -134,9 +134,11 @@ const static struct dma_buf_ops radeon_d .kmap_atomic = radeon_gem_kmap_atomic, .kunmap = radeon_gem_kunmap, diff --git a/patches/drm/02-revert-vm_mmap.patch b/patches/drm/02-revert-vm_mmap.patch index aec746a8cb55..91e429ee8fea 100644 --- a/patches/drm/02-revert-vm_mmap.patch +++ b/patches/drm/02-revert-vm_mmap.patch @@ -3,11 +3,9 @@ those changes for versions older than that. These can't be backported as they rely on non-exported symbols. -Index: compat-drm/drivers/gpu/drm/drm_bufs.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/drm_bufs.c -+++ compat-drm/drivers/gpu/drm/drm_bufs.c -@@ -1553,6 +1553,20 @@ int drm_mapbufs(struct drm_device *dev, +--- a/drivers/gpu/drm/drm_bufs.c ++++ b/drivers/gpu/drm/drm_bufs.c +@@ -1541,6 +1541,20 @@ int drm_mapbufs(struct drm_device *dev, retcode = -EINVAL; goto done; } @@ -28,7 +26,7 @@ Index: compat-drm/drivers/gpu/drm/drm_bufs.c virtual = vm_mmap(file_priv->filp, 0, map->size, PROT_READ | PROT_WRITE, MAP_SHARED, -@@ -1561,6 +1575,7 @@ int drm_mapbufs(struct drm_device *dev, +@@ -1549,6 +1563,7 @@ int drm_mapbufs(struct drm_device *dev, virtual = vm_mmap(file_priv->filp, 0, dma->byte_count, PROT_READ | PROT_WRITE, MAP_SHARED, 0); @@ -36,10 +34,8 @@ Index: compat-drm/drivers/gpu/drm/drm_bufs.c } if (virtual > -1024UL) { /* Real error */ -Index: compat-drm/drivers/gpu/drm/i810/i810_dma.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i810/i810_dma.c -+++ compat-drm/drivers/gpu/drm/i810/i810_dma.c +--- a/drivers/gpu/drm/i810/i810_dma.c ++++ b/drivers/gpu/drm/i810/i810_dma.c @@ -133,9 +133,17 @@ static int i810_map_buffer(struct drm_bu old_fops = file_priv->filp->f_op; file_priv->filp->f_op = &i810_buffer_fops; @@ -75,11 +71,9 @@ Index: compat-drm/drivers/gpu/drm/i810/i810_dma.c buf_priv->currently_mapped = I810_BUF_UNMAPPED; buf_priv->virtual = NULL; -Index: compat-drm/drivers/gpu/drm/i915/i915_gem.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/i915_gem.c -+++ compat-drm/drivers/gpu/drm/i915/i915_gem.c -@@ -1045,10 +1045,17 @@ i915_gem_mmap_ioctl(struct drm_device *d +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -1054,10 +1054,17 @@ i915_gem_mmap_ioctl(struct drm_device *d drm_gem_object_unreference_unlocked(obj); return -EINVAL; } diff --git a/patches/drm/03-swiotlb.patch b/patches/drm/03-swiotlb.patch index eaa583bcbc22..cdc72ed51884 100644 --- a/patches/drm/03-swiotlb.patch +++ b/patches/drm/03-swiotlb.patch @@ -3,10 +3,8 @@ swiotlb_nr_tbl() was available since 3.2 but was exported since 3.3. Since it uses an internal global state variable, it is impossible to backport it to compat.git. So revert the changes. -Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_bo.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/nouveau/nouveau_bo.c -+++ compat-drm/drivers/gpu/drm/nouveau/nouveau_bo.c +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1297,11 +1297,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t } #endif @@ -36,11 +34,9 @@ Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_bo.c for (i = 0; i < ttm->num_pages; i++) { if (ttm_dma->dma_address[i]) { -Index: compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/radeon/radeon_ttm.c -+++ compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c -@@ -630,11 +630,13 @@ static int radeon_ttm_tt_populate(struct +--- a/drivers/gpu/drm/radeon/radeon_ttm.c ++++ b/drivers/gpu/drm/radeon/radeon_ttm.c +@@ -602,11 +602,13 @@ static int radeon_ttm_tt_populate(struct } #endif @@ -54,7 +50,7 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c r = ttm_pool_populate(ttm); if (r) { -@@ -676,12 +678,14 @@ static void radeon_ttm_tt_unpopulate(str +@@ -648,12 +650,14 @@ static void radeon_ttm_tt_unpopulate(str } #endif @@ -69,7 +65,7 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c for (i = 0; i < ttm->num_pages; i++) { if (gtt->ttm.dma_address[i]) { -@@ -906,6 +910,7 @@ static int radeon_ttm_debugfs_init(struc +@@ -876,6 +880,7 @@ static int radeon_ttm_debugfs_init(struc radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs; radeon_mem_types_list[i].driver_features = 0; radeon_mem_types_list[i++].data = NULL; @@ -77,7 +73,7 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c #ifdef CONFIG_SWIOTLB if (swiotlb_nr_tbl()) { sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool"); -@@ -915,6 +920,7 @@ static int radeon_ttm_debugfs_init(struc +@@ -885,6 +890,7 @@ static int radeon_ttm_debugfs_init(struc radeon_mem_types_list[i++].data = NULL; } #endif diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch index c835790e0099..b9ce93d2f23e 100644 --- a/patches/drm/04-revert-prime-support.patch +++ b/patches/drm/04-revert-prime-support.patch @@ -6,10 +6,8 @@ the one in 3.3 is mostly stub, e.g. it is a skeleton API which is highly modified in 3.4. So disable PRIME for kernels < 3.4.0, not < 3.3.0. -Index: compat-drm/drivers/gpu/drm/drm_drv.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/drm_drv.c -+++ compat-drm/drivers/gpu/drm/drm_drv.c +--- a/drivers/gpu/drm/drm_drv.c ++++ b/drivers/gpu/drm/drm_drv.c @@ -137,8 +137,10 @@ static struct drm_ioctl_desc drm_ioctls[ DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_CONTROL_ALLOW|DRM_UNLOCKED), @@ -21,11 +19,9 @@ Index: compat-drm/drivers/gpu/drm/drm_drv.c DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED), -Index: compat-drm/drivers/gpu/drm/drm_fops.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/drm_fops.c -+++ compat-drm/drivers/gpu/drm/drm_fops.c -@@ -271,8 +271,10 @@ static int drm_open_helper(struct inode +--- a/drivers/gpu/drm/drm_fops.c ++++ b/drivers/gpu/drm/drm_fops.c +@@ -267,8 +267,10 @@ static int drm_open_helper(struct inode if (dev->driver->driver_features & DRIVER_GEM) drm_gem_open(dev, priv); @@ -36,7 +32,7 @@ Index: compat-drm/drivers/gpu/drm/drm_fops.c if (dev->driver->open) { ret = dev->driver->open(dev, priv); -@@ -575,8 +577,10 @@ int drm_release(struct inode *inode, str +@@ -521,8 +523,10 @@ int drm_release(struct inode *inode, str if (dev->driver->postclose) dev->driver->postclose(dev, file_priv); @@ -47,10 +43,8 @@ Index: compat-drm/drivers/gpu/drm/drm_fops.c kfree(file_priv); -Index: compat-drm/drivers/gpu/drm/drm_gem.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/drm_gem.c -+++ compat-drm/drivers/gpu/drm/drm_gem.c +--- a/drivers/gpu/drm/drm_gem.c ++++ b/drivers/gpu/drm/drm_gem.c @@ -35,7 +35,11 @@ #include #include @@ -79,10 +73,8 @@ Index: compat-drm/drivers/gpu/drm/drm_gem.c } /** -Index: compat-drm/drivers/gpu/drm/drm_prime.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/drm_prime.c -+++ compat-drm/drivers/gpu/drm/drm_prime.c +--- a/drivers/gpu/drm/drm_prime.c ++++ b/drivers/gpu/drm/drm_prime.c @@ -26,6 +26,8 @@ * */ @@ -97,10 +89,8 @@ Index: compat-drm/drivers/gpu/drm/drm_prime.c } EXPORT_SYMBOL(drm_prime_remove_imported_buf_handle); +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ -Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/nouveau/nouveau_prime.c -+++ compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c +--- a/drivers/gpu/drm/nouveau/nouveau_prime.c ++++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -22,6 +22,7 @@ * Authors: Dave Airlie */ @@ -115,10 +105,8 @@ Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c } - +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ -Index: compat-drm/drivers/gpu/drm/radeon/radeon_prime.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/radeon/radeon_prime.c -+++ compat-drm/drivers/gpu/drm/radeon/radeon_prime.c +--- a/drivers/gpu/drm/radeon/radeon_prime.c ++++ b/drivers/gpu/drm/radeon/radeon_prime.c @@ -23,6 +23,8 @@ * * Authors: Alex Deucher @@ -133,11 +121,9 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_prime.c return ERR_PTR(ret); } +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ -Index: compat-drm/drivers/gpu/drm/radeon/radeon_drv.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/radeon/radeon_drv.c -+++ compat-drm/drivers/gpu/drm/radeon/radeon_drv.c -@@ -340,8 +340,10 @@ static const struct file_operations rade +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -342,8 +342,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 | @@ -150,7 +136,7 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_drv.c .dev_priv_size = 0, .load = radeon_driver_load_kms, .firstopen = radeon_driver_firstopen_kms, -@@ -377,10 +379,12 @@ static struct drm_driver kms_driver = { +@@ -378,10 +380,12 @@ static struct drm_driver kms_driver = { .dumb_destroy = radeon_mode_dumb_destroy, .fops = &radeon_driver_kms_fops, @@ -163,10 +149,8 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_drv.c .name = DRIVER_NAME, .desc = DRIVER_DESC, -Index: compat-drm/drivers/gpu/drm/radeon/radeon_gem.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/radeon/radeon_gem.c -+++ compat-drm/drivers/gpu/drm/radeon/radeon_gem.c +--- a/drivers/gpu/drm/radeon/radeon_gem.c ++++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -42,8 +42,10 @@ void radeon_gem_object_free(struct drm_g struct radeon_bo *robj = gem_to_radeon_bo(gobj); @@ -178,10 +162,8 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_gem.c radeon_bo_unref(&robj); } } -Index: compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/radeon/radeon_ttm.c -+++ compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c +--- a/drivers/gpu/drm/radeon/radeon_ttm.c ++++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -583,17 +583,21 @@ static int radeon_ttm_tt_populate(struct struct radeon_ttm_tt *gtt = (void *)ttm; unsigned i; @@ -217,10 +199,8 @@ Index: compat-drm/drivers/gpu/drm/radeon/radeon_ttm.c rdev = radeon_get_rdev(ttm->bdev); #if __OS_HAS_AGP -Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_bo.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/nouveau/nouveau_bo.c -+++ compat-drm/drivers/gpu/drm/nouveau/nouveau_bo.c +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1275,11 +1275,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t struct drm_device *dev; unsigned i; @@ -257,11 +237,9 @@ Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_bo.c dev_priv = nouveau_bdev(ttm->bdev); dev = dev_priv->dev; -Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_drv.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/nouveau/nouveau_drv.c -+++ compat-drm/drivers/gpu/drm/nouveau/nouveau_drv.c -@@ -403,7 +403,10 @@ static struct drm_driver driver = { +--- a/drivers/gpu/drm/nouveau/nouveau_drv.c ++++ b/drivers/gpu/drm/nouveau/nouveau_drv.c +@@ -419,7 +419,10 @@ static struct drm_driver driver = { .driver_features = DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | @@ -273,7 +251,7 @@ Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_drv.c .load = nouveau_load, .firstopen = nouveau_firstopen, .lastclose = nouveau_lastclose, -@@ -426,10 +429,12 @@ static struct drm_driver driver = { +@@ -441,10 +444,12 @@ static struct drm_driver driver = { .ioctls = nouveau_ioctls, .fops = &nouveau_driver_fops, @@ -286,10 +264,8 @@ Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_drv.c .gem_init_object = nouveau_gem_object_new, .gem_free_object = nouveau_gem_object_del, -Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_gem.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/nouveau/nouveau_gem.c -+++ compat-drm/drivers/gpu/drm/nouveau/nouveau_gem.c +--- a/drivers/gpu/drm/nouveau/nouveau_gem.c ++++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -23,7 +23,9 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * @@ -311,11 +287,9 @@ Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_gem.c ttm_bo_unref(&bo); -Index: compat-drm/drivers/gpu/drm/i915/i915_drv.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/i915_drv.c -+++ compat-drm/drivers/gpu/drm/i915/i915_drv.c -@@ -1050,7 +1050,11 @@ static struct drm_driver driver = { +--- a/drivers/gpu/drm/i915/i915_drv.c ++++ b/drivers/gpu/drm/i915/i915_drv.c +@@ -956,7 +956,11 @@ static struct drm_driver driver = { */ .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ @@ -327,7 +301,7 @@ Index: compat-drm/drivers/gpu/drm/i915/i915_drv.c .load = i915_driver_load, .unload = i915_driver_unload, .open = i915_driver_open, -@@ -1074,10 +1078,12 @@ static struct drm_driver driver = { +@@ -979,10 +983,12 @@ static struct drm_driver driver = { .gem_free_object = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops, @@ -340,10 +314,8 @@ Index: compat-drm/drivers/gpu/drm/i915/i915_drv.c .dumb_create = i915_gem_dumb_create, .dumb_map_offset = i915_gem_mmap_gtt, -Index: compat-drm/drivers/gpu/drm/i915/i915_gem.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/i915_gem.c -+++ compat-drm/drivers/gpu/drm/i915/i915_gem.c +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c @@ -35,7 +35,9 @@ #include #include @@ -354,7 +326,7 @@ Index: compat-drm/drivers/gpu/drm/i915/i915_gem.c static __must_check int i915_gem_object_flush_gpu_write_domain(struct drm_i915_gem_object *obj); static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj); -@@ -3522,8 +3524,10 @@ void i915_gem_free_object(struct drm_gem +@@ -3547,8 +3549,10 @@ void i915_gem_free_object(struct drm_gem trace_i915_gem_object_destroy(obj); @@ -365,10 +337,8 @@ Index: compat-drm/drivers/gpu/drm/i915/i915_gem.c if (obj->phys_obj) i915_gem_detach_phys_object(dev, obj); -Index: compat-drm/drivers/gpu/drm/i915/i915_gem_dmabuf.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/i915_gem_dmabuf.c -+++ compat-drm/drivers/gpu/drm/i915/i915_gem_dmabuf.c +--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c ++++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -23,6 +23,7 @@ * Authors: * Dave Airlie diff --git a/patches/drm/05-i915-define-acpi-video-class.patch b/patches/drm/05-i915-define-acpi-video-class.patch index 7fddd3b64620..49725afbe898 100644 --- a/patches/drm/05-i915-define-acpi-video-class.patch +++ b/patches/drm/05-i915-define-acpi-video-class.patch @@ -2,11 +2,9 @@ The definition of ACPI_VIDEO_CLASS was moved from video.c to video.h in 3.1. Define it here to fix build for kernels older than 3.1. -Index: compat-drm/drivers/gpu/drm/i915/intel_opregion.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/intel_opregion.c -+++ compat-drm/drivers/gpu/drm/i915/intel_opregion.c -@@ -307,6 +307,9 @@ static int intel_opregion_video_event(st +--- a/drivers/gpu/drm/i915/intel_opregion.c ++++ b/drivers/gpu/drm/i915/intel_opregion.c +@@ -305,6 +305,9 @@ static int intel_opregion_video_event(st struct acpi_bus_event *event = data; int ret = NOTIFY_OK; diff --git a/patches/drm/98-pr_fmt.patch b/patches/drm/98-pr_fmt.patch index 1b0680b60f08..e8b59bb45492 100644 --- a/patches/drm/98-pr_fmt.patch +++ b/patches/drm/98-pr_fmt.patch @@ -4,10 +4,8 @@ during build. Patch adapted from compat-wireless tree. -Index: compat-drm/drivers/gpu/drm/ttm/ttm_agp_backend.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_agp_backend.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_agp_backend.c +--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c ++++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c @@ -29,8 +29,10 @@ * Keith Packard. */ @@ -19,10 +17,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_agp_backend.c #include "ttm/ttm_module.h" #include "ttm/ttm_bo_driver.h" #include "ttm/ttm_page_alloc.h" -Index: compat-drm/drivers/gpu/drm/ttm/ttm_bo.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_bo.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_bo.c +--- a/drivers/gpu/drm/ttm/ttm_bo.c ++++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -28,11 +28,13 @@ * Authors: Thomas Hellstrom */ @@ -37,10 +33,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_bo.c #include #include #include -Index: compat-drm/drivers/gpu/drm/ttm/ttm_bo_vm.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_bo_vm.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c ++++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -28,8 +28,10 @@ * Authors: Thomas Hellstrom */ @@ -52,10 +46,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_bo_vm.c #include #include #include -Index: compat-drm/drivers/gpu/drm/ttm/ttm_memory.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_memory.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_memory.c +--- a/drivers/gpu/drm/ttm/ttm_memory.c ++++ b/drivers/gpu/drm/ttm/ttm_memory.c @@ -25,11 +25,13 @@ * **************************************************************************/ @@ -70,10 +62,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_memory.c #include #include #include -Index: compat-drm/drivers/gpu/drm/ttm/ttm_object.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_object.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_object.c +--- a/drivers/gpu/drm/ttm/ttm_object.c ++++ b/drivers/gpu/drm/ttm/ttm_object.c @@ -49,10 +49,12 @@ * for fast lookup of ref objects given a base object. */ @@ -87,10 +77,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_object.c #include #include #include -Index: compat-drm/drivers/gpu/drm/ttm/ttm_page_alloc.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_page_alloc.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_page_alloc.c +--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c ++++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -31,8 +31,10 @@ * - doesn't track currently in use pages */ @@ -102,10 +90,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_page_alloc.c #include #include #include -Index: compat-drm/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c ++++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -33,8 +33,10 @@ * when freed). */ @@ -117,10 +103,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c #include #include #include /* for seq_printf */ -Index: compat-drm/drivers/gpu/drm/ttm/ttm_tt.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/ttm/ttm_tt.c -+++ compat-drm/drivers/gpu/drm/ttm/ttm_tt.c +--- a/drivers/gpu/drm/ttm/ttm_tt.c ++++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -28,8 +28,10 @@ * Authors: Thomas Hellstrom */ @@ -132,10 +116,8 @@ Index: compat-drm/drivers/gpu/drm/ttm/ttm_tt.c #include #include #include -Index: compat-drm/drivers/gpu/drm/i915/i915_dma.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/i915_dma.c -+++ compat-drm/drivers/gpu/drm/i915/i915_dma.c +--- a/drivers/gpu/drm/i915/i915_dma.c ++++ b/drivers/gpu/drm/i915/i915_dma.c @@ -26,6 +26,7 @@ * */ @@ -152,10 +134,8 @@ Index: compat-drm/drivers/gpu/drm/i915/i915_dma.c #include #include #include -Index: compat-drm/drivers/gpu/drm/i915/i915_irq.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/i915_irq.c -+++ compat-drm/drivers/gpu/drm/i915/i915_irq.c +--- a/drivers/gpu/drm/i915/i915_irq.c ++++ b/drivers/gpu/drm/i915/i915_irq.c @@ -26,8 +26,10 @@ * */ @@ -167,10 +147,8 @@ Index: compat-drm/drivers/gpu/drm/i915/i915_irq.c #include #include #include "drmP.h" -Index: compat-drm/drivers/gpu/drm/i915/intel_opregion.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/intel_opregion.c -+++ compat-drm/drivers/gpu/drm/i915/intel_opregion.c +--- a/drivers/gpu/drm/i915/intel_opregion.c ++++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -25,8 +25,10 @@ * */ @@ -182,10 +160,8 @@ Index: compat-drm/drivers/gpu/drm/i915/intel_opregion.c #include #include #include -Index: compat-drm/drivers/gpu/drm/i915/intel_panel.c -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/i915/intel_panel.c -+++ compat-drm/drivers/gpu/drm/i915/intel_panel.c +--- a/drivers/gpu/drm/i915/intel_panel.c ++++ b/drivers/gpu/drm/i915/intel_panel.c @@ -28,8 +28,10 @@ * Chris Wilson */ diff --git a/patches/drm/99-change-makefile.patch b/patches/drm/99-change-makefile.patch index 882a02d8c084..08ed460f9d56 100644 --- a/patches/drm/99-change-makefile.patch +++ b/patches/drm/99-change-makefile.patch @@ -1,9 +1,7 @@ Remove drivers that we do not want to build from gpu/drm/Makefile -Index: compat-drm/drivers/gpu/drm/Makefile -=================================================================== ---- compat-drm.orig/drivers/gpu/drm/Makefile -+++ compat-drm/drivers/gpu/drm/Makefile +--- a/drivers/gpu/drm/Makefile ++++ b/drivers/gpu/drm/Makefile @@ -28,21 +28,14 @@ CFLAGS_drm_trace_points.o := -I$(src) obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_USB) += drm_usb.o diff --git a/patches/network/0001-netdev_ops.patch b/patches/network/0001-netdev_ops.patch index 7d70e1e04360..068a8a1da349 100644 --- a/patches/network/0001-netdev_ops.patch +++ b/patches/network/0001-netdev_ops.patch @@ -71,7 +71,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3437,7 +3437,7 @@ static int rndis_wlan_bind(struct usbnet +@@ -3439,7 +3439,7 @@ static int rndis_wlan_bind(struct usbnet * rndis_host wants to avoid all OID as much as possible * so do promisc/multicast handling in rndis_wlan. */ @@ -93,7 +93,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 dev->irq = sdev->irq; --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6107,7 +6107,7 @@ static struct net_device *ipw2100_alloc_ +@@ -6106,7 +6106,7 @@ static struct net_device *ipw2100_alloc_ priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; @@ -124,7 +124,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 net_dev->wireless_handlers = &ipw_wx_handler_def; --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -988,7 +988,7 @@ struct lbs_private *lbs_add_card(void *c +@@ -991,7 +991,7 @@ struct lbs_private *lbs_add_card(void *c wdev->netdev = dev; priv->dev = dev; @@ -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 -@@ -1302,7 +1302,7 @@ static const struct net_device_ops hwsim +@@ -1299,7 +1299,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { @@ -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 -@@ -636,7 +636,7 @@ static const struct net_device_ops mwifi +@@ -639,7 +639,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/0002-net-misc.patch b/patches/network/0002-net-misc.patch index ff1fa516c082..78dcbf11e7ed 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 -@@ -953,6 +953,11 @@ static void ieee80211_if_setup(struct ne +@@ -977,6 +977,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/03-rfkill.patch b/patches/network/03-rfkill.patch index a9022e00490c..9fa08d2bfb34 100644 --- a/patches/network/03-rfkill.patch +++ b/patches/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 -@@ -233,7 +233,7 @@ static int rfkill_connect(struct input_h +@@ -232,7 +232,7 @@ static int rfkill_connect(struct input_h handle->dev = dev; handle->handler = handler; diff --git a/patches/network/04-netns.patch b/patches/network/04-netns.patch index f334e026449d..70b6f419e0e1 100644 --- a/patches/network/04-netns.patch +++ b/patches/network/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -5689,7 +5689,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -5712,7 +5712,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); @@ -34,7 +34,7 @@ files... static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data) { -@@ -326,7 +328,9 @@ struct wiphy *wiphy_new(const struct cfg +@@ -341,7 +343,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), -@@ -785,8 +789,10 @@ static int cfg80211_netdev_notifier_call +@@ -834,8 +838,10 @@ static int cfg80211_netdev_notifier_call wdev->identifier = ++rdev->wdev_id; list_add_rcu(&wdev->list, &rdev->wdev_list); rdev->devlist_generation++; @@ -55,7 +55,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -973,6 +979,7 @@ static struct notifier_block cfg80211_ne +@@ -1027,6 +1033,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; -@@ -990,14 +997,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) -@@ -1032,8 +1042,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); -@@ -1045,7 +1057,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(); diff --git a/patches/network/08-rename-config-options.patch b/patches/network/08-rename-config-options.patch index c07f2181a25b..0258deaf8c11 100644 --- a/patches/network/08-rename-config-options.patch +++ b/patches/network/08-rename-config-options.patch @@ -126,7 +126,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. --- a/drivers/net/wireless/ath/ath9k/rc.h +++ b/drivers/net/wireless/ath/ath9k/rc.h -@@ -219,7 +219,7 @@ struct ath_rate_priv { +@@ -215,7 +215,7 @@ struct ath_rate_priv { struct ath_rc_stats rcstats[RATE_TABLE_SIZE]; }; @@ -156,7 +156,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. #else --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c -@@ -860,7 +860,7 @@ static int rfcomm_sock_ioctl(struct sock +@@ -862,7 +862,7 @@ static int rfcomm_sock_ioctl(struct sock err = bt_sock_ioctl(sock, cmd, arg); if (err == -ENOIOCTLCMD) { diff --git a/patches/network/09-cfg80211-wext-padding.patch b/patches/network/09-cfg80211-wext-padding.patch index de4e8e4873bc..27c7ed68dc3a 100644 --- 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 -@@ -2143,6 +2143,9 @@ struct wiphy_wowlan_support { +@@ -2154,6 +2154,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ @@ -42,7 +42,7 @@ moved due to struct enlargements. u8 addr_mask[ETH_ALEN]; --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -274,6 +274,17 @@ struct wiphy *wiphy_new(const struct cfg +@@ -289,6 +289,17 @@ struct wiphy *wiphy_new(const struct cfg struct cfg80211_registered_device *rdev; int alloc_size; diff --git a/patches/network/09-threaded-irq.patch b/patches/network/09-threaded-irq.patch index 0bc5920bb574..df57be559d87 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 -@@ -4206,8 +4206,13 @@ redo: +@@ -4212,8 +4212,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; -@@ -4249,9 +4254,17 @@ static int b43_wireless_core_start(struc +@@ -4255,9 +4260,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); -@@ -5045,6 +5058,10 @@ static int b43_setup_bands(struct b43_wl +@@ -5080,6 +5093,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 -@@ -855,6 +855,9 @@ struct b43_wldev { +@@ -859,6 +859,9 @@ struct b43_wldev { unsigned int tx_count; unsigned int rx_count; #endif @@ -63,7 +63,7 @@ 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 -@@ -5538,14 +5538,25 @@ int __devinit wlcore_probe(struct wl1271 +@@ -5540,14 +5540,25 @@ int __devinit wlcore_probe(struct wl1271 platform_set_drvdata(pdev, wl); @@ -89,7 +89,7 @@ thread in process context as well. if (ret < 0) { wl1271_error("request_irq() failed: %d", ret); goto out_free_hw; -@@ -5619,7 +5630,11 @@ out_unreg: +@@ -5621,7 +5632,11 @@ out_unreg: wl1271_unregister_hw(wl); out_irq: @@ -101,7 +101,7 @@ thread in process context as well. out_free_hw: wlcore_free_hw(wl); -@@ -5638,7 +5653,12 @@ int __devexit wlcore_remove(struct platf +@@ -5640,7 +5655,12 @@ int __devexit wlcore_remove(struct platf disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl); diff --git a/patches/network/10-add-wext-handlers-to-netdev.patch b/patches/network/10-add-wext-handlers-to-netdev.patch index 20d196cbe140..c4d7a090b93e 100644 --- a/patches/network/10-add-wext-handlers-to-netdev.patch +++ b/patches/network/10-add-wext-handlers-to-netdev.patch @@ -18,7 +18,7 @@ CONFIG_WIRELESS_EXT in compat-drivers. --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -327,10 +327,6 @@ struct wiphy *wiphy_new(const struct cfg +@@ -342,10 +342,6 @@ struct wiphy *wiphy_new(const struct cfg INIT_LIST_HEAD(&rdev->bss_list); INIT_WORK(&rdev->scan_done_wk, __cfg80211_scan_done); INIT_WORK(&rdev->sched_scan_results_wk, __cfg80211_sched_scan_results); @@ -29,7 +29,7 @@ CONFIG_WIRELESS_EXT in compat-drivers. device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -813,6 +809,15 @@ static int cfg80211_netdev_notifier_call +@@ -862,6 +858,15 @@ static int cfg80211_netdev_notifier_call wdev->sme_state = CFG80211_SME_IDLE; mutex_unlock(&rdev->devlist_mtx); #ifdef CONFIG_CFG80211_WEXT diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch index 15af08cea8ce..d00031048e27 100644 --- a/patches/network/11-dev-pm-ops.patch +++ b/patches/network/11-dev-pm-ops.patch @@ -143,7 +143,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 -@@ -3881,7 +3881,12 @@ static struct pci_driver il3945_driver = +@@ -3885,7 +3885,12 @@ static struct pci_driver il3945_driver = .id_table = il3945_hw_card_ids, .probe = il3945_pci_probe, .remove = __devexit_p(il3945_pci_remove), @@ -158,7 +158,7 @@ calls on compat code with only slight modifications. static int __init --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -6769,7 +6769,12 @@ static struct pci_driver il4965_driver = +@@ -6773,7 +6773,12 @@ static struct pci_driver il4965_driver = .id_table = il4965_hw_card_ids, .probe = il4965_pci_probe, .remove = __devexit_p(il4965_pci_remove), diff --git a/patches/network/12-iw_handler-changes.patch b/patches/network/12-iw_handler-changes.patch index 2c350fd12839..5b54509692d8 100644 --- a/patches/network/12-iw_handler-changes.patch +++ b/patches/network/12-iw_handler-changes.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6110,7 +6110,11 @@ static struct net_device *ipw2100_alloc_ +@@ -6109,7 +6109,11 @@ static struct net_device *ipw2100_alloc_ netdev_attach_ops(dev, &ipw2100_netdev_ops); dev->ethtool_ops = &ipw2100_ethtool_ops; dev->wireless_handlers = &ipw2100_wx_handler_def; diff --git a/patches/network/12-mac80211-disable-tx-status.patch b/patches/network/12-mac80211-disable-tx-status.patch index 2c43013fdce3..97ac8d335f40 100644 --- a/patches/network/12-mac80211-disable-tx-status.patch +++ b/patches/network/12-mac80211-disable-tx-status.patch @@ -6,7 +6,7 @@ So we need to just ifdef this part out. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1966,6 +1966,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1958,6 +1958,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail; } @@ -14,7 +14,7 @@ So we need to just ifdef this part out. if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -2004,6 +2005,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1996,6 +1997,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/network/14-device-type.patch b/patches/network/14-device-type.patch index 9c4b2b6dff46..d7e8220c531f 100644 --- a/patches/network/14-device-type.patch +++ b/patches/network/14-device-type.patch @@ -8,9 +8,9 @@ compile warning. --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -745,9 +745,11 @@ static void wdev_cleanup_work(struct wor - dev_put(wdev->netdev); +@@ -794,9 +794,11 @@ void cfg80211_unregister_wdev(struct wir } + EXPORT_SYMBOL(cfg80211_unregister_wdev); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) static struct device_type wiphy_type = { diff --git a/patches/network/15-symbol-export-conflicts.patch b/patches/network/15-symbol-export-conflicts.patch index 6abd8ebc8109..3757e8131efd 100644 --- a/patches/network/15-symbol-export-conflicts.patch +++ b/patches/network/15-symbol-export-conflicts.patch @@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our. --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -3056,7 +3056,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3104,7 +3104,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/network/16-bluetooth.patch b/patches/network/16-bluetooth.patch index 8400efdd6305..59fcdd86a0a2 100644 --- a/patches/network/16-bluetooth.patch +++ b/patches/network/16-bluetooth.patch @@ -31,7 +31,7 @@ here still, but for now we keep this here. --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c -@@ -111,8 +111,12 @@ int bt_sock_unregister(int proto) +@@ -112,8 +112,12 @@ int bt_sock_unregister(int proto) } EXPORT_SYMBOL(bt_sock_unregister); @@ -44,7 +44,7 @@ here still, but for now we keep this here. { int err; -@@ -130,7 +134,11 @@ static int bt_sock_create(struct net *ne +@@ -131,7 +135,11 @@ static int bt_sock_create(struct net *ne read_lock(&bt_proto_lock); if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { @@ -56,7 +56,7 @@ here still, but for now we keep this here. if (!err) bt_sock_reclassify_lock(sock->sk, proto); module_put(bt_proto[proto]->owner); -@@ -463,7 +471,11 @@ int bt_sock_ioctl(struct socket *sock, u +@@ -464,7 +472,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; @@ -84,7 +84,7 @@ here still, but for now we keep this here. wake_up_process(session->task); --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -883,8 +883,13 @@ drop: +@@ -884,8 +884,13 @@ drop: goto done; } @@ -98,7 +98,7 @@ here still, but for now we keep this here. { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -1057,8 +1062,12 @@ static struct proto hci_sk_proto = { +@@ -1059,8 +1064,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; @@ -385,7 +385,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -661,7 +666,11 @@ static int rfcomm_sock_setsockopt_old(st +@@ -662,7 +667,11 @@ static int rfcomm_sock_setsockopt_old(st return err; } @@ -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 -@@ -423,8 +423,12 @@ static struct sock *sco_sock_alloc(struc +@@ -432,8 +432,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; -@@ -653,7 +657,11 @@ static int sco_sock_sendmsg(struct kiocb +@@ -662,7 +666,11 @@ static int sco_sock_sendmsg(struct kiocb return err; } @@ -489,7 +489,7 @@ here still, but for now we keep this here. int err = 0; --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c -@@ -180,8 +180,12 @@ static struct proto bnep_proto = { +@@ -186,8 +186,12 @@ static struct proto bnep_proto = { .obj_size = sizeof(struct bt_sock) }; @@ -504,7 +504,7 @@ here still, but for now we keep this here. --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c -@@ -189,8 +189,12 @@ static struct proto cmtp_proto = { +@@ -195,8 +195,12 @@ static struct proto cmtp_proto = { .obj_size = sizeof(struct bt_sock) }; @@ -519,7 +519,7 @@ here still, but for now we keep this here. --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c -@@ -229,8 +229,12 @@ static struct proto hidp_proto = { +@@ -235,8 +235,12 @@ static struct proto hidp_proto = { .obj_size = sizeof(struct bt_sock) }; @@ -534,7 +534,7 @@ here still, but for now we keep this here. --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c -@@ -559,7 +559,14 @@ static int l2cap_sock_setsockopt_old(str +@@ -564,7 +564,14 @@ static int l2cap_sock_setsockopt_old(str return err; } @@ -549,7 +549,7 @@ here still, but for now we keep this here. { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1187,8 +1194,12 @@ static struct sock *l2cap_sock_alloc(str +@@ -1194,8 +1201,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -562,7 +562,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -1200,7 +1211,11 @@ static int l2cap_sock_create(struct net +@@ -1207,7 +1218,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/network/17-netdev-queue.patch b/patches/network/17-netdev-queue.patch index 28eb99f1c647..2dd37a318d82 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 -@@ -1521,6 +1521,7 @@ void ieee80211_if_remove(struct ieee8021 +@@ -1578,6 +1578,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,9 +22,9 @@ The patch that introduced this on mac80211 was: void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -1540,6 +1541,22 @@ void ieee80211_remove_interfaces(struct - unregister_netdevice_many(&unreg_list); - list_del(&unreg_list); +@@ -1605,6 +1606,22 @@ void ieee80211_remove_interfaces(struct + kfree(sdata); + } } +#else +void ieee80211_remove_interfaces(struct ieee80211_local *local) diff --git a/patches/network/22-multiqueue.patch b/patches/network/22-multiqueue.patch index 74b6cc00afa2..86b63e59945a 100644 --- a/patches/network/22-multiqueue.patch +++ b/patches/network/22-multiqueue.patch @@ -30,7 +30,7 @@ in compat. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1483,6 +1483,10 @@ void ieee80211_xmit(struct ieee80211_sub +@@ -1482,6 +1482,10 @@ void ieee80211_xmit(struct ieee80211_sub return; } diff --git a/patches/network/24-pcmcia.patch b/patches/network/24-pcmcia.patch index 22ce2c02eae7..634c44764d22 100644 --- a/patches/network/24-pcmcia.patch +++ b/patches/network/24-pcmcia.patch @@ -128,7 +128,7 @@ return bluecard_config(link); } -@@ -876,15 +924,30 @@ static int bluecard_config(struct pcmcia +@@ -873,15 +921,30 @@ static int bluecard_config(struct pcmcia bluecard_info_t *info = link->priv; int i, n; @@ -159,7 +159,7 @@ if (i == 0) break; } -@@ -892,9 +955,15 @@ static int bluecard_config(struct pcmcia +@@ -889,9 +952,15 @@ static int bluecard_config(struct pcmcia if (i != 0) goto failed; @@ -175,7 +175,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -932,7 +1001,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids +@@ -929,7 +998,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids static struct pcmcia_driver bluecard_driver = { .owner = THIS_MODULE, @@ -267,15 +267,15 @@ return bt3c_config(link); } -@@ -660,6 +695,7 @@ static void bt3c_detach(struct pcmcia_de - kfree(info); +@@ -657,6 +692,7 @@ static void bt3c_detach(struct pcmcia_de + bt3c_release(link); } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data) { int *try = priv_data; -@@ -698,6 +734,63 @@ static int bt3c_check_config_notpicky(st +@@ -695,6 +731,63 @@ static int bt3c_check_config_notpicky(st } return -ENODEV; } @@ -339,7 +339,7 @@ static int bt3c_config(struct pcmcia_device *link) { -@@ -721,9 +814,15 @@ static int bt3c_config(struct pcmcia_dev +@@ -718,9 +811,15 @@ static int bt3c_config(struct pcmcia_dev goto failed; found_port: @@ -355,7 +355,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -758,7 +857,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids); +@@ -755,7 +854,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids); static struct pcmcia_driver bt3c_driver = { .owner = THIS_MODULE, @@ -471,15 +471,15 @@ return btuart_config(link); } -@@ -589,6 +632,7 @@ static void btuart_detach(struct pcmcia_ - kfree(info); +@@ -586,6 +629,7 @@ static void btuart_detach(struct pcmcia_ + btuart_release(link); } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) { int *try = priv_data; -@@ -627,6 +671,63 @@ static int btuart_check_config_notpicky( +@@ -624,6 +668,63 @@ static int btuart_check_config_notpicky( } return -ENODEV; } @@ -543,7 +543,7 @@ static int btuart_config(struct pcmcia_device *link) { -@@ -650,9 +751,15 @@ static int btuart_config(struct pcmcia_d +@@ -647,9 +748,15 @@ static int btuart_config(struct pcmcia_d goto failed; found_port: @@ -559,7 +559,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -686,7 +793,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids); +@@ -683,7 +790,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids); static struct pcmcia_driver btuart_driver = { .owner = THIS_MODULE, @@ -674,15 +674,15 @@ return dtl1_config(link); } -@@ -572,6 +614,7 @@ static void dtl1_detach(struct pcmcia_de - kfree(info); +@@ -571,6 +613,7 @@ static void dtl1_detach(struct pcmcia_de + pcmcia_disable_device(link); } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data) { if ((p_dev->resource[1]->end) || (p_dev->resource[1]->end < 8)) -@@ -582,6 +625,29 @@ static int dtl1_confcheck(struct pcmcia_ +@@ -581,6 +624,29 @@ static int dtl1_confcheck(struct pcmcia_ return pcmcia_request_io(p_dev); } @@ -712,7 +712,7 @@ static int dtl1_config(struct pcmcia_device *link) { -@@ -589,14 +655,24 @@ static int dtl1_config(struct pcmcia_dev +@@ -588,14 +654,24 @@ static int dtl1_config(struct pcmcia_dev int ret; /* Look for a generic full-sized window */ @@ -737,7 +737,7 @@ ret = pcmcia_enable_device(link); if (ret) -@@ -624,7 +700,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); +@@ -623,7 +699,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); static struct pcmcia_driver dtl1_driver = { .owner = THIS_MODULE, diff --git a/patches/network/25-multicast-list_head.patch b/patches/network/25-multicast-list_head.patch index 543844ce454d..541e9326cd47 100644 --- a/patches/network/25-multicast-list_head.patch +++ b/patches/network/25-multicast-list_head.patch @@ -179,7 +179,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return ((u64)(mfilt[1]) << 32) | mfilt[0]; --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c -@@ -897,17 +897,35 @@ out: +@@ -899,17 +899,35 @@ out: return err; } @@ -254,7 +254,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c -@@ -419,20 +419,36 @@ static int lbtf_op_config(struct ieee802 +@@ -421,20 +421,36 @@ static int lbtf_op_config(struct ieee802 } static u64 lbtf_op_prepare_multicast(struct ieee80211_hw *hw, @@ -321,7 +321,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes); --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c -@@ -2566,15 +2566,21 @@ struct mwl8k_cmd_mac_multicast_adr { +@@ -2567,15 +2567,21 @@ struct mwl8k_cmd_mac_multicast_adr { static struct mwl8k_cmd_pkt * __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, @@ -343,7 +343,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 if (allmulti || mc_count > priv->num_mcaddrs) { allmulti = 1; -@@ -2595,13 +2601,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee +@@ -2596,13 +2602,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee if (allmulti) { cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); } else if (mc_count) { @@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } } -@@ -4825,7 +4845,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -4828,7 +4848,11 @@ mwl8k_bss_info_changed(struct ieee80211_ } static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, @@ -383,7 +383,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 { struct mwl8k_cmd_pkt *cmd; -@@ -4836,7 +4860,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -4839,7 +4863,11 @@ static u64 mwl8k_prepare_multicast(struc * we'll end up throwing this packet away and creating a new * one in mwl8k_configure_filter(). */ @@ -395,7 +395,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (unsigned long)cmd; } -@@ -4958,7 +4986,11 @@ static void mwl8k_configure_filter(struc +@@ -4961,7 +4989,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); @@ -494,7 +494,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c -@@ -816,10 +816,19 @@ static void rtl8180_bss_info_changed(str +@@ -818,10 +818,19 @@ static void rtl8180_bss_info_changed(str } } @@ -516,7 +516,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8180_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c -@@ -1288,9 +1288,17 @@ static void rtl8187_bss_info_changed(str +@@ -1290,9 +1290,17 @@ static void rtl8187_bss_info_changed(str } static u64 rtl8187_prepare_multicast(struct ieee80211_hw *dev, @@ -536,7 +536,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8187_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -2799,11 +2799,20 @@ struct wl1271_filter_params { +@@ -2801,11 +2801,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -557,7 +557,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 struct wl1271 *wl = hw->priv; if (unlikely(wl->state == WL1271_STATE_OFF)) -@@ -2816,16 +2825,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -2818,16 +2827,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ @@ -600,7 +600,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (u64)(unsigned long)fp; --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c -@@ -1213,17 +1213,34 @@ static void zd_process_intr(struct work_ +@@ -1215,17 +1215,34 @@ static void zd_process_intr(struct work_ static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw, @@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2286,7 +2286,11 @@ struct ieee80211_ops { +@@ -2335,7 +2335,11 @@ struct ieee80211_ops { u32 changed); u64 (*prepare_multicast)(struct ieee80211_hw *hw, @@ -681,7 +681,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h -@@ -214,14 +214,28 @@ static inline void drv_bss_info_changed( +@@ -216,14 +216,28 @@ static inline void drv_bss_info_changed( } static inline u64 drv_prepare_multicast(struct ieee80211_local *local, @@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -860,7 +860,12 @@ struct ieee80211_local { +@@ -865,7 +865,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ @@ -768,7 +768,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -613,9 +617,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -620,9 +624,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask; INIT_LIST_HEAD(&local->interfaces); diff --git a/patches/network/29-sdio_no_suspend.patch b/patches/network/29-sdio_no_suspend.patch index f0847526850c..5474f9dd61c2 100644 --- a/patches/network/29-sdio_no_suspend.patch +++ b/patches/network/29-sdio_no_suspend.patch @@ -52,7 +52,7 @@ suspend and resume that are not backported. static int __init ath6kl_sdio_init(void) --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -1319,6 +1319,7 @@ static void if_sdio_remove(struct sdio_f +@@ -1320,6 +1320,7 @@ static void if_sdio_remove(struct sdio_f lbs_deb_leave(LBS_DEB_SDIO); } @@ -60,7 +60,7 @@ suspend and resume that are not backported. static int if_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1372,15 +1373,18 @@ static const struct dev_pm_ops if_sdio_p +@@ -1373,15 +1374,18 @@ static const struct dev_pm_ops if_sdio_p .suspend = if_sdio_suspend, .resume = if_sdio_resume, }; @@ -171,7 +171,7 @@ suspend and resume that are not backported. }, --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c -@@ -1052,6 +1052,7 @@ static void btmrvl_sdio_remove(struct sd +@@ -1045,6 +1045,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); -@@ -1147,6 +1148,7 @@ static const struct dev_pm_ops btmrvl_sd +@@ -1140,6 +1141,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", -@@ -1155,7 +1157,9 @@ static struct sdio_driver bt_mrvl_sdio = +@@ -1148,7 +1150,9 @@ static struct sdio_driver bt_mrvl_sdio = .remove = btmrvl_sdio_remove, .drv = { .owner = THIS_MODULE, diff --git a/patches/network/30-bridge-port.patch b/patches/network/30-bridge-port.patch index 376678852556..02a04aa08b96 100644 --- a/patches/network/30-bridge-port.patch +++ b/patches/network/30-bridge-port.patch @@ -23,7 +23,7 @@ compat-drivers. --- a/net/wireless/util.c +++ b/net/wireless/util.c -@@ -817,7 +817,7 @@ int cfg80211_change_iface(struct cfg8021 +@@ -809,7 +809,7 @@ int cfg80211_change_iface(struct cfg8021 return -EOPNOTSUPP; /* if it's part of a bridge, reject changing type to station/ibss */ @@ -34,7 +34,7 @@ compat-drivers. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1880,7 +1880,7 @@ static int nl80211_valid_4addr(struct cf +@@ -1881,7 +1881,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/network/36-workqueue.patch b/patches/network/36-workqueue.patch index 43fe87da21ee..d990302a30dc 100644 --- a/patches/network/36-workqueue.patch +++ b/patches/network/36-workqueue.patch @@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -1124,6 +1124,10 @@ static void __exit ieee80211_exit(void) +@@ -1131,6 +1131,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); diff --git a/patches/network/42-netlink_seq.patch b/patches/network/42-netlink_seq.patch index 5c5fc6e419b4..4aaf7f10347e 100644 --- a/patches/network/42-netlink_seq.patch +++ b/patches/network/42-netlink_seq.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -4690,7 +4690,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -4713,7 +4713,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); 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 a7fc3624acae..e580d7cfb060 100644 --- 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 -@@ -354,8 +354,10 @@ void mwifiex_set_trans_start(struct net_ +@@ -368,8 +368,10 @@ void mwifiex_set_trans_start(struct net_ { int i; diff --git a/patches/network/48-use_skb_get_queue_mapping.patch b/patches/network/48-use_skb_get_queue_mapping.patch index 9bf79838ad0b..f27801d73c92 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 -@@ -3418,11 +3418,11 @@ static void b43_op_tx(struct ieee80211_h +@@ -3424,11 +3424,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 -@@ -2503,11 +2503,11 @@ static void b43legacy_op_tx(struct ieee8 +@@ -2504,11 +2504,11 @@ static void b43legacy_op_tx(struct ieee8 } B43legacy_WARN_ON(skb_shinfo(skb)->nr_frags); diff --git a/patches/network/50-libertas-olpc-ec-wakeup.patch b/patches/network/50-libertas-olpc-ec-wakeup.patch index fcd66fb66232..5997a7527b5a 100644 --- a/patches/network/50-libertas-olpc-ec-wakeup.patch +++ b/patches/network/50-libertas-olpc-ec-wakeup.patch @@ -5,7 +5,7 @@ older kernels. --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c -@@ -961,6 +961,7 @@ static int if_usb_suspend(struct usb_int +@@ -962,6 +962,7 @@ static int if_usb_suspend(struct usb_int goto out; } @@ -13,7 +13,7 @@ older kernels. #ifdef CONFIG_OLPC if (machine_is_olpc()) { if (priv->wol_criteria == EHS_REMOVE_WAKEUP) -@@ -969,6 +970,7 @@ static int if_usb_suspend(struct usb_int +@@ -970,6 +971,7 @@ static int if_usb_suspend(struct usb_int olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); } #endif diff --git a/patches/network/62-usb_driver_lpm.patch b/patches/network/62-usb_driver_lpm.patch index fae6c61bd0cd..2ca1fd67a2d3 100644 --- a/patches/network/62-usb_driver_lpm.patch +++ b/patches/network/62-usb_driver_lpm.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c -@@ -448,7 +448,9 @@ static struct usb_driver ath3k_driver = +@@ -450,7 +450,9 @@ static struct usb_driver ath3k_driver = .probe = ath3k_probe, .disconnect = ath3k_disconnect, .id_table = ath3k_table, @@ -12,7 +12,7 @@ module_usb_driver(ath3k_driver); --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c -@@ -279,7 +279,9 @@ static struct usb_driver bcm203x_driver +@@ -273,7 +273,9 @@ static struct usb_driver bcm203x_driver .probe = bcm203x_probe, .disconnect = bcm203x_disconnect, .id_table = bcm203x_table, @@ -24,7 +24,7 @@ module_usb_driver(bcm203x_driver); --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c -@@ -749,7 +749,9 @@ static struct usb_driver bfusb_driver = +@@ -745,7 +745,9 @@ static struct usb_driver bfusb_driver = .probe = bfusb_probe, .disconnect = bfusb_disconnect, .id_table = bfusb_table, @@ -36,7 +36,7 @@ module_usb_driver(bfusb_driver); --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c -@@ -508,7 +508,9 @@ static struct usb_driver bpa10x_driver = +@@ -504,7 +504,9 @@ static struct usb_driver bpa10x_driver = .probe = bpa10x_probe, .disconnect = bpa10x_disconnect, .id_table = bpa10x_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 = +@@ -1219,7 +1219,9 @@ static struct usb_driver btusb_driver = #endif .id_table = btusb_table, .supports_autosuspend = 1, @@ -84,7 +84,7 @@ module_usb_driver(rndis_driver); --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c -@@ -2486,7 +2486,9 @@ static struct usb_driver at76_driver = { +@@ -2488,7 +2488,9 @@ static struct usb_driver at76_driver = { .probe = at76_probe, .disconnect = at76_disconnect, .id_table = dev_table, @@ -144,7 +144,7 @@ void brcmf_usb_exit(void) --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c -@@ -1014,7 +1014,9 @@ static struct usb_driver if_usb_driver = +@@ -1015,7 +1015,9 @@ static struct usb_driver if_usb_driver = .suspend = if_usb_suspend, .resume = if_usb_resume, .reset_resume = if_usb_resume, @@ -192,7 +192,7 @@ module_usb_driver(p54u_driver); --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3756,7 +3756,9 @@ static struct usb_driver rndis_wlan_driv +@@ -3758,7 +3758,9 @@ static struct usb_driver rndis_wlan_driv .disconnect = usbnet_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, @@ -240,7 +240,7 @@ module_usb_driver(rt73usb_driver); --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c -@@ -1671,7 +1671,9 @@ static struct usb_driver rtl8187_driver +@@ -1673,7 +1673,9 @@ static struct usb_driver rtl8187_driver .id_table = rtl8187_table, .probe = rtl8187_probe, .disconnect = __devexit_p(rtl8187_disconnect), @@ -264,7 +264,7 @@ module_usb_driver(rtl8192cu_driver); --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c -@@ -1542,7 +1542,9 @@ static struct usb_driver driver = { +@@ -1541,7 +1541,9 @@ static struct usb_driver driver = { .disconnect = disconnect, .pre_reset = pre_reset, .post_reset = post_reset, -- 2.30.2