* [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next.
@ 2012-11-28 23:07 Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 1/6] compat-drivers: make patches apply again Hauke Mehrtens
` (5 more replies)
0 siblings, 6 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-28 23:07 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This patch series mostly contains fixes for some problems introduces by
changes in linu-next.
This was compile tested with kernel version 2.6.24 to 3.7 and still has
some compile problems with kernel 2.6.27 and 2.6.24.
Hauke Mehrtens (6):
compat-drivers: make patches apply again
compat-drivers: remove option for alx driver
compat-drivers: build RTL8723AE
compat-drivers: refresh patches
compat-drivers: add import to fix compile error
compat-drivers: do not use struct spinlock
config.mk | 2 +-
patches/drm/03-swiotlb.patch | 8 +-
patches/drm/04-revert-prime-support.patch | 22 ++---
patches/drm/05-i915-define-acpi-video-class.patch | 2 +-
patches/drm/06-rename-config-options.patch | 16 ++--
patches/drm/07-intel-gtt.patch | 13 ++-
.../drm/09-nouveau-compatify-kconfig-vars.patch | 72 ++++++----------
.../10-radeon-revert-acpi-table-size-check.patch | 6 +-
patches/drm/98-pr_fmt.patch | 14 ++++
patches/drm/99-change-makefile.patch | 3 +-
patches/network/0001-netdev_ops.patch | 24 +++---
patches/network/0002-net-misc.patch | 4 +-
.../0003-netdev-needed_headroom_tailroom.patch | 4 +-
patches/network/0005-netlink-portid.patch | 87 +++++++++++---------
patches/network/04-netns.patch | 14 ++--
patches/network/06-header-changes.patch | 10 +++
patches/network/08-rename-config-options.patch | 28 +++----
patches/network/09-cfg80211-wext-padding.patch | 2 +-
patches/network/09-threaded-irq.patch | 6 +-
.../network/10-add-wext-handlers-to-netdev.patch | 4 +-
patches/network/11-dev-pm-ops.patch | 41 ++++++++-
patches/network/12-iw_handler-changes.patch | 2 +-
patches/network/14-device-type.patch | 4 +-
patches/network/15-symbol-export-conflicts.patch | 2 +-
patches/network/16-bluetooth.patch | 6 +-
patches/network/17-netdev-queue.patch | 4 +-
patches/network/25-multicast-list_head.patch | 36 ++++----
patches/network/26-sdio-quirks.patch | 4 +-
patches/network/29-sdio_no_suspend.patch | 22 ++---
patches/network/30-bridge-port.patch | 4 +-
patches/network/36-workqueue.patch | 2 +-
patches/network/40-netdev-hw-features.patch | 8 +-
patches/network/42-netlink_seq.patch | 2 +-
patches/network/46-use_other_workqueue.patch | 2 +-
patches/network/53-pr_fmt.patch | 32 ++-----
patches/network/54-get_ts_info.patch | 2 +-
patches/network/62-usb_driver_lpm.patch | 18 ++--
patches/network/67-use_spinlock_t.patch | 11 +++
38 files changed, 294 insertions(+), 249 deletions(-)
create mode 100644 patches/network/67-use_spinlock_t.patch
--
1.7.10.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/6] compat-drivers: make patches apply again
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
@ 2012-11-28 23:07 ` Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 2/6] compat-drivers: remove option for alx driver Hauke Mehrtens
` (4 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-28 23:07 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/drm/06-rename-config-options.patch | 16 ++---
patches/drm/07-intel-gtt.patch | 13 +++--
patches/drm/98-pr_fmt.patch | 14 +++++
patches/drm/99-change-makefile.patch | 3 +-
patches/network/0005-netlink-portid.patch | 87 ++++++++++++++++------------
patches/network/53-pr_fmt.patch | 32 +++-------
6 files changed, 92 insertions(+), 73 deletions(-)
diff --git a/patches/drm/06-rename-config-options.patch b/patches/drm/06-rename-config-options.patch
index 3b8e78e..9ca7ed9 100644
--- a/patches/drm/06-rename-config-options.patch
+++ b/patches/drm/06-rename-config-options.patch
@@ -1,6 +1,6 @@
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
-@@ -15,37 +15,37 @@ drm-y := drm_auth.o drm_buffer.o d
+@@ -15,38 +15,38 @@ drm-y := drm_auth.o drm_buffer.o d
drm_trace_points.o drm_global.o drm_prime.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o
@@ -9,7 +9,7 @@
drm-usb-y := drm_usb.o
- drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o
+ drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_helper.o
-drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
-drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
+drm_kms_helper-$(CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
@@ -41,6 +41,7 @@
-obj-$(CONFIG_DRM_UDL) += udl/
-obj-$(CONFIG_DRM_AST) += ast/
-obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
+-obj-$(CONFIG_DRM_TEGRA) += tegra/
+obj-$(CONFIG_COMPAT_DRM) += drm.o
+obj-$(CONFIG_COMPAT_DRM_USB) += drm_usb.o
+obj-$(CONFIG_COMPAT_DRM_TTM) += ttm/
@@ -62,6 +63,7 @@
+obj-$(CONFIG_COMPAT_DRM_UDL) += udl/
+obj-$(CONFIG_COMPAT_DRM_AST) += ast/
+obj-$(CONFIG_COMPAT_DRM_SHMOBILE) +=shmobile/
++obj-$(CONFIG_COMPAT_DRM_TEGRA) += tegra/
obj-y += i2c/
--- a/drivers/gpu/drm/ast/Makefile
+++ b/drivers/gpu/drm/ast/Makefile
@@ -82,7 +84,7 @@
+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
+@@ -142,7 +142,7 @@ int drm_helper_probe_single_connector_mo
goto prune;
}
@@ -180,7 +182,7 @@
MODULE_DEVICE_TABLE(pci, pciidlist);
#endif
-@@ -431,7 +431,7 @@ static int __init radeon_init(void)
+@@ -440,7 +440,7 @@ static int __init radeon_init(void)
#endif
/* if enabled by default */
if (radeon_modeset == -1) {
@@ -207,9 +209,9 @@
+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
+@@ -8,4 +8,4 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.
+ vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \
+ vmwgfx_surface.o
-obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o
+obj-$(CONFIG_COMPAT_DRM_VMWGFX) := vmwgfx.o
diff --git a/patches/drm/07-intel-gtt.patch b/patches/drm/07-intel-gtt.patch
index 62df61c..ec026e0 100644
--- a/patches/drm/07-intel-gtt.patch
+++ b/patches/drm/07-intel-gtt.patch
@@ -24,14 +24,19 @@ 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)
+@@ -3911,9 +3911,14 @@ i915_gem_init_hw(struct drm_device *dev)
drm_i915_private_t *dev_priv = dev->dev_private;
int ret;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
- if (!intel_enable_gtt())
+- if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())
++ if (INTEL_INFO(dev)->gen < 6)
return -EIO;
-+#endif
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
++ if (!intel_enable_gtt())
++ return -EIO;
++#endif
++
if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1))
I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000);
+
diff --git a/patches/drm/98-pr_fmt.patch b/patches/drm/98-pr_fmt.patch
index f2dd3f8..3c92245 100644
--- a/patches/drm/98-pr_fmt.patch
+++ b/patches/drm/98-pr_fmt.patch
@@ -4,6 +4,20 @@ during build.
Patch adapted from compat-wireless tree.
+--- a/drivers/gpu/drm/drm_fb_helper.c
++++ b/drivers/gpu/drm/drm_fb_helper.c
+@@ -27,9 +27,11 @@
+ * Dave Airlie <airlied@linux.ie>
+ * Jesse Barnes <jesse.barnes@intel.com>
+ */
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/kernel.h>
++#include <linux/printk.h>
+ #include <linux/sysrq.h>
+ #include <linux/slab.h>
+ #include <linux/fb.h>
--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c
@@ -29,8 +29,10 @@
diff --git a/patches/drm/99-change-makefile.patch b/patches/drm/99-change-makefile.patch
index 840ce62..28f911c 100644
--- a/patches/drm/99-change-makefile.patch
+++ b/patches/drm/99-change-makefile.patch
@@ -2,7 +2,7 @@ Remove drivers that we do not want to build from gpu/drm/Makefile
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
-@@ -30,22 +30,14 @@ CFLAGS_drm_trace_points.o := -I$(src)
+@@ -30,23 +30,14 @@ CFLAGS_drm_trace_points.o := -I$(src)
obj-$(CONFIG_COMPAT_DRM) += drm.o
obj-$(CONFIG_COMPAT_DRM_USB) += drm_usb.o
obj-$(CONFIG_COMPAT_DRM_TTM) += ttm/
@@ -24,4 +24,5 @@ Remove drivers that we do not want to build from gpu/drm/Makefile
-obj-$(CONFIG_COMPAT_DRM_UDL) += udl/
obj-$(CONFIG_COMPAT_DRM_AST) += ast/
-obj-$(CONFIG_COMPAT_DRM_SHMOBILE) +=shmobile/
+-obj-$(CONFIG_COMPAT_DRM_TEGRA) += tegra/
obj-y += i2c/
diff --git a/patches/network/0005-netlink-portid.patch b/patches/network/0005-netlink-portid.patch
index 4a3131e..b7df3f1 100644
--- a/patches/network/0005-netlink-portid.patch
+++ b/patches/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
-@@ -1632,10 +1632,10 @@ static int hwsim_register_received_nl(st
+@@ -1925,10 +1925,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:
-@@ -1672,7 +1672,7 @@ static int mac80211_hwsim_netlink_notify
+@@ -1965,7 +1965,7 @@ static int mac80211_hwsim_netlink_notify
if (state != NETLINK_URELEASE)
return NOTIFY_DONE;
@@ -66,7 +66,7 @@ this one should other drivers / subsystem need this change.
wmediumd_portid = 0;
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -1276,7 +1276,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1282,7 +1282,7 @@ static int nl80211_dump_wiphy(struct sk_
continue;
if (++idx <= start)
continue;
@@ -75,7 +75,7 @@ this one should other drivers / subsystem need this change.
cb->nlh->nlmsg_seq, NLM_F_MULTI,
dev) < 0) {
idx--;
-@@ -1299,7 +1299,7 @@ static int nl80211_get_wiphy(struct sk_b
+@@ -1305,7 +1305,7 @@ static int nl80211_get_wiphy(struct sk_b
if (!msg)
return -ENOMEM;
@@ -84,7 +84,7 @@ this one should other drivers / subsystem need this change.
nlmsg_free(msg);
return -ENOBUFS;
}
-@@ -1814,7 +1814,7 @@ static int nl80211_dump_interface(struct
+@@ -1940,7 +1940,7 @@ static int nl80211_dump_interface(struct
if_idx++;
continue;
}
@@ -93,7 +93,7 @@ this one should other drivers / subsystem need this change.
cb->nlh->nlmsg_seq, NLM_F_MULTI,
rdev, wdev) < 0) {
mutex_unlock(&rdev->devlist_mtx);
-@@ -1845,7 +1845,7 @@ static int nl80211_get_interface(struct
+@@ -1971,7 +1971,7 @@ static int nl80211_get_interface(struct
if (!msg)
return -ENOMEM;
@@ -102,7 +102,7 @@ this one should other drivers / subsystem need this change.
dev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2063,7 +2063,7 @@ static int nl80211_new_interface(struct
+@@ -2189,7 +2189,7 @@ static int nl80211_new_interface(struct
break;
}
@@ -111,7 +111,7 @@ this one should other drivers / subsystem need this change.
rdev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2198,7 +2198,7 @@ static int nl80211_get_key(struct sk_buf
+@@ -2324,7 +2324,7 @@ static int nl80211_get_key(struct sk_buf
if (!msg)
return -ENOMEM;
@@ -120,7 +120,7 @@ this one should other drivers / subsystem need this change.
NL80211_CMD_NEW_KEY);
if (IS_ERR(hdr))
return PTR_ERR(hdr);
-@@ -2962,7 +2962,7 @@ static int nl80211_dump_station(struct s
+@@ -3100,7 +3100,7 @@ static int nl80211_dump_station(struct s
goto out_err;
if (nl80211_send_station(skb,
@@ -129,7 +129,7 @@ this one should other drivers / subsystem need this change.
cb->nlh->nlmsg_seq, NLM_F_MULTI,
dev, netdev, mac_addr,
&sinfo) < 0)
-@@ -3008,7 +3008,7 @@ static int nl80211_get_station(struct sk
+@@ -3146,7 +3146,7 @@ static int nl80211_get_station(struct sk
if (!msg)
return -ENOMEM;
@@ -138,7 +138,7 @@ this one should other drivers / subsystem need this change.
rdev, dev, mac_addr, &sinfo) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -3424,7 +3424,7 @@ static int nl80211_dump_mpath(struct sk_
+@@ -3562,7 +3562,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)
-@@ -3473,7 +3473,7 @@ static int nl80211_get_mpath(struct sk_b
+@@ -3611,7 +3611,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;
-@@ -3713,7 +3713,7 @@ static int nl80211_get_mesh_config(struc
+@@ -3851,7 +3851,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;
-@@ -4031,7 +4031,7 @@ static int nl80211_get_reg(struct sk_buf
+@@ -4169,7 +4169,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;
-@@ -4675,7 +4675,7 @@ static int nl80211_send_bss(struct sk_bu
+@@ -4813,7 +4813,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;
-@@ -4894,7 +4894,7 @@ static int nl80211_dump_survey(struct sk
+@@ -5032,7 +5032,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)
-@@ -5527,7 +5527,7 @@ static int nl80211_testmode_dump(struct
+@@ -5677,7 +5677,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;
-@@ -5606,7 +5606,7 @@ struct sk_buff *cfg80211_testmode_alloc_
+@@ -5756,7 +5756,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);
}
-@@ -5945,7 +5945,7 @@ static int nl80211_remain_on_channel(str
+@@ -6089,7 +6089,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)) {
-@@ -6164,7 +6164,7 @@ static int nl80211_register_mgmt(struct
+@@ -6308,7 +6308,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]));
}
-@@ -6245,7 +6245,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -6378,7 +6378,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)) {
-@@ -6361,7 +6361,7 @@ static int nl80211_get_power_save(struct
+@@ -6493,7 +6493,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;
-@@ -6561,7 +6561,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -6684,7 +6684,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;
-@@ -6838,7 +6838,7 @@ static int nl80211_register_unexpected_f
+@@ -6961,7 +6961,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;
}
-@@ -6868,7 +6868,7 @@ static int nl80211_probe_client(struct s
+@@ -6991,7 +6991,7 @@ static int nl80211_probe_client(struct s
if (!msg)
return -ENOMEM;
@@ -273,23 +273,34 @@ this one should other drivers / subsystem need this change.
NL80211_CMD_PROBE_CLIENT);
if (IS_ERR(hdr)) {
-@@ -6906,7 +6906,7 @@ static int nl80211_register_beacons(stru
- if (rdev->ap_beacons_nlportid)
- return -EBUSY;
-
-- rdev->ap_beacons_nlportid = info->snd_portid;
-+ rdev->ap_beacons_nlportid = genl_info_snd_portid(info);
+@@ -7035,13 +7035,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) {
+- if (reg->nlportid == info->snd_portid) {
++ if (reg->nlportid == genl_info_snd_portid(info)) {
+ rv = -EALREADY;
+ goto out_err;
+ }
+ }
+ /* Add it to the list */
+- nreg->nlportid = info->snd_portid;
++ nreg->nlportid = genl_info_snd_portid(info);
+ list_add(&nreg->list, &rdev->beacon_registrations);
- return 0;
- }
-@@ -8970,8 +8970,8 @@ static int nl80211_netlink_notify(struct
+ spin_unlock_bh(&rdev->beacon_registrations_lock);
+@@ -9169,12 +9169,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)
- cfg80211_mlme_unregister_socket(wdev, notify->portid);
-- if (rdev->ap_beacons_nlportid == notify->portid)
+ cfg80211_mlme_unregister_socket(wdev, netlink_notify_portid(notify));
-+ if (rdev->ap_beacons_nlportid == netlink_notify_portid(notify))
- rdev->ap_beacons_nlportid = 0;
- }
+ spin_lock_bh(&rdev->beacon_registrations_lock);
+ list_for_each_entry_safe(reg, tmp, &rdev->beacon_registrations,
+ list) {
+- if (reg->nlportid == notify->portid) {
++ if (reg->nlportid == netlink_notify_portid(notify)) {
+ list_del(®->list);
+ kfree(reg);
+ break;
diff --git a/patches/network/53-pr_fmt.patch b/patches/network/53-pr_fmt.patch
index 181ea86..9dc8d64 100644
--- a/patches/network/53-pr_fmt.patch
+++ b/patches/network/53-pr_fmt.patch
@@ -229,20 +229,6 @@ compiler warnings. This is going to be sent upstream.
#include <linux/etherdevice.h>
#include <linux/sched.h>
#include <linux/firmware.h>
---- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
-@@ -13,9 +13,10 @@
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
--
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-+#include <linux/printk.h>
- #include <linux/slab.h>
- #include <linux/delay.h>
- #include <linux/pci.h>
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -14,8 +14,10 @@
@@ -294,7 +280,7 @@ compiler warnings. This is going to be sent upstream.
+#include <linux/printk.h>
#include <linux/types.h>
#include <linux/netdevice.h>
- #include <linux/sched.h>
+
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -15,8 +15,10 @@
@@ -317,12 +303,12 @@ compiler warnings. This is going to be sent upstream.
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- #include <linux/init.h>
#include <linux/kernel.h>
+ #include <linux/etherdevice.h>
+#include <linux/printk.h>
- #include <linux/kthread.h>
- #include <linux/slab.h>
- #include <linux/skbuff.h>
+ #include <linux/module.h>
+ #include <net/cfg80211.h>
+ #include <net/rtnetlink.h>
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -14,9 +14,11 @@
@@ -335,8 +321,8 @@ compiler warnings. This is going to be sent upstream.
#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/string.h>
- #include <linux/sched.h>
#include <linux/netdevice.h>
+ #include <brcmu_wifi.h>
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -15,8 +15,10 @@
@@ -361,9 +347,9 @@ compiler warnings. This is going to be sent upstream.
#include <linux/kernel.h>
+#include <linux/printk.h>
- #include <linux/if_arp.h>
- #include <linux/sched.h>
- #include <linux/kthread.h>
+ #include <linux/etherdevice.h>
+ #include <net/cfg80211.h>
+ #include <net/netlink.h>
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -14,6 +14,7 @@
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/6] compat-drivers: remove option for alx driver
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 1/6] compat-drivers: make patches apply again Hauke Mehrtens
@ 2012-11-28 23:07 ` Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 3/6] compat-drivers: build RTL8723AE Hauke Mehrtens
` (3 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-28 23:07 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
The alx driver was removed from crap and also remove the config option.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/config.mk b/config.mk
index fb55812..ae515bc 100644
--- a/config.mk
+++ b/config.mk
@@ -412,7 +412,6 @@ export CONFIG_ATL2=m
export CONFIG_ATL1E=m
ifndef CONFIG_COMPAT_KERNEL_2_6_28
export CONFIG_ATL1C=m
-export CONFIG_ALX=m
endif #CONFIG_COMPAT_KERNEL_2_6_28
ifdef CONFIG_WIRELESS_EXT
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/6] compat-drivers: build RTL8723AE
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 1/6] compat-drivers: make patches apply again Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 2/6] compat-drivers: remove option for alx driver Hauke Mehrtens
@ 2012-11-28 23:07 ` Hauke Mehrtens
2012-11-29 21:08 ` Luis R. Rodriguez
2012-11-28 23:07 ` [PATCH 4/6] compat-drivers: refresh patches Hauke Mehrtens
` (2 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-28 23:07 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This driver is building on all supported kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 1 +
patches/network/11-dev-pm-ops.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/config.mk b/config.mk
index ae515bc..8513142 100644
--- a/config.mk
+++ b/config.mk
@@ -433,6 +433,7 @@ endif #CONFIG_WIRELESS_EXT
export CONFIG_RTL8192CE=m
export CONFIG_RTL8192SE=m
export CONFIG_RTL8192DE=m
+export CONFIG_RTL8723AE=m
export CONFIG_BRCMSMAC=m
diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch
index 206f34e..2df8809 100644
--- a/patches/network/11-dev-pm-ops.patch
+++ b/patches/network/11-dev-pm-ops.patch
@@ -360,6 +360,39 @@ calls on compat code with only slight modifications.
};
module_pci_driver(rtl92se_driver);
+--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
++++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+@@ -367,21 +367,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+ MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+ MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+
+-static const struct dev_pm_ops rtlwifi_pm_ops = {
+- .suspend = rtl_pci_suspend,
+- .resume = rtl_pci_resume,
+- .freeze = rtl_pci_suspend,
+- .thaw = rtl_pci_resume,
+- .poweroff = rtl_pci_suspend,
+- .restore = rtl_pci_resume,
+-};
++compat_pci_suspend(rtl_pci_suspend)
++compat_pci_resume(rtl_pci_resume)
++
++static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+
+ static struct pci_driver rtl8723ae_driver = {
+ .name = KBUILD_MODNAME,
+ .id_table = rtl8723ae_pci_ids,
+ .probe = rtl_pci_probe,
+ .remove = rtl_pci_disconnect,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+ .driver.pm = &rtlwifi_pm_ops,
++#elif defined(CONFIG_PM)
++ .suspend = rtl_pci_suspend_compat,
++ .resume = rtl_pci_resume_compat,
++#endif
+ };
+
+ module_pci_driver(rtl8723ae_driver);
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -681,14 +681,10 @@ static int p54p_resume(struct device *de
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/6] compat-drivers: refresh patches
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
` (2 preceding siblings ...)
2012-11-28 23:07 ` [PATCH 3/6] compat-drivers: build RTL8723AE Hauke Mehrtens
@ 2012-11-28 23:07 ` Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 5/6] compat-drivers: add import to fix compile error Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 6/6] compat-drivers: do not use struct spinlock Hauke Mehrtens
5 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-28 23:07 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This was done by running "./scripts/admin-refresh.sh refresh".
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/drm/03-swiotlb.patch | 8 +--
patches/drm/04-revert-prime-support.patch | 22 +++---
patches/drm/05-i915-define-acpi-video-class.patch | 2 +-
.../drm/09-nouveau-compatify-kconfig-vars.patch | 72 +++++++-------------
.../10-radeon-revert-acpi-table-size-check.patch | 6 +-
patches/network/0001-netdev_ops.patch | 24 +++----
patches/network/0002-net-misc.patch | 4 +-
.../0003-netdev-needed_headroom_tailroom.patch | 4 +-
patches/network/04-netns.patch | 14 ++--
patches/network/08-rename-config-options.patch | 28 ++++----
patches/network/09-cfg80211-wext-padding.patch | 2 +-
patches/network/09-threaded-irq.patch | 6 +-
.../network/10-add-wext-handlers-to-netdev.patch | 4 +-
patches/network/11-dev-pm-ops.patch | 8 +--
patches/network/12-iw_handler-changes.patch | 2 +-
patches/network/14-device-type.patch | 4 +-
patches/network/15-symbol-export-conflicts.patch | 2 +-
patches/network/16-bluetooth.patch | 6 +-
patches/network/17-netdev-queue.patch | 4 +-
patches/network/25-multicast-list_head.patch | 36 +++++-----
patches/network/26-sdio-quirks.patch | 4 +-
patches/network/29-sdio_no_suspend.patch | 22 +++---
patches/network/30-bridge-port.patch | 2 +-
patches/network/36-workqueue.patch | 2 +-
patches/network/40-netdev-hw-features.patch | 8 +--
patches/network/42-netlink_seq.patch | 2 +-
patches/network/46-use_other_workqueue.patch | 2 +-
patches/network/54-get_ts_info.patch | 2 +-
patches/network/62-usb_driver_lpm.patch | 18 ++---
29 files changed, 146 insertions(+), 174 deletions(-)
diff --git a/patches/drm/03-swiotlb.patch b/patches/drm/03-swiotlb.patch
index be09c64..697c063 100644
--- a/patches/drm/03-swiotlb.patch
+++ b/patches/drm/03-swiotlb.patch
@@ -36,7 +36,7 @@ to backport it to compat.git. So revert the changes.
if (ttm_dma->dma_address[i]) {
--- 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
+@@ -601,11 +601,13 @@ static int radeon_ttm_tt_populate(struct
}
#endif
@@ -50,7 +50,7 @@ to backport it to compat.git. So revert the changes.
r = ttm_pool_populate(ttm);
if (r) {
-@@ -648,12 +650,14 @@ static void radeon_ttm_tt_unpopulate(str
+@@ -647,12 +649,14 @@ static void radeon_ttm_tt_unpopulate(str
}
#endif
@@ -65,7 +65,7 @@ to backport it to compat.git. So revert the changes.
for (i = 0; i < ttm->num_pages; i++) {
if (gtt->ttm.dma_address[i]) {
-@@ -876,6 +880,7 @@ static int radeon_ttm_debugfs_init(struc
+@@ -875,6 +879,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;
@@ -73,7 +73,7 @@ to backport it to compat.git. So revert the changes.
#ifdef CONFIG_SWIOTLB
if (swiotlb_nr_tbl()) {
sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");
-@@ -885,6 +890,7 @@ static int radeon_ttm_debugfs_init(struc
+@@ -884,6 +889,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 b244210..e12c396 100644
--- a/patches/drm/04-revert-prime-support.patch
+++ b/patches/drm/04-revert-prime-support.patch
@@ -21,7 +21,7 @@ not < 3.3.0.
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
-@@ -267,8 +267,10 @@ static int drm_open_helper(struct inode
+@@ -283,8 +283,10 @@ static int drm_open_helper(struct inode
if (dev->driver->driver_features & DRIVER_GEM)
drm_gem_open(dev, priv);
@@ -32,7 +32,7 @@ not < 3.3.0.
if (dev->driver->open) {
ret = dev->driver->open(dev, priv);
-@@ -521,8 +523,10 @@ int drm_release(struct inode *inode, str
+@@ -537,8 +539,10 @@ int drm_release(struct inode *inode, str
if (dev->driver->postclose)
dev->driver->postclose(dev, file_priv);
@@ -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
-@@ -345,8 +345,10 @@ static const struct file_operations rade
+@@ -354,8 +354,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,
-@@ -381,10 +383,12 @@ static struct drm_driver kms_driver = {
+@@ -390,10 +392,12 @@ static struct drm_driver kms_driver = {
.dumb_destroy = radeon_mode_dumb_destroy,
.fops = &radeon_driver_kms_fops,
@@ -161,7 +161,7 @@ not < 3.3.0.
}
--- 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
+@@ -582,17 +582,21 @@ static int radeon_ttm_tt_populate(struct
struct radeon_ttm_tt *gtt = (void *)ttm;
unsigned i;
int r;
@@ -183,7 +183,7 @@ not < 3.3.0.
rdev = radeon_get_rdev(ttm->bdev);
#if __OS_HAS_AGP
-@@ -637,10 +641,12 @@ static void radeon_ttm_tt_unpopulate(str
+@@ -636,10 +640,12 @@ static void radeon_ttm_tt_unpopulate(str
struct radeon_device *rdev;
struct radeon_ttm_tt *gtt = (void *)ttm;
unsigned i;
@@ -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
-@@ -581,7 +581,10 @@ driver = {
+@@ -591,7 +591,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,
-@@ -602,10 +605,12 @@ driver = {
+@@ -612,10 +615,12 @@ driver = {
.ioctls = nouveau_ioctls,
.fops = &nouveau_driver_fops,
@@ -286,7 +286,7 @@ not < 3.3.0.
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -967,7 +967,11 @@ static struct drm_driver driver = {
+@@ -1018,7 +1018,11 @@ static struct drm_driver driver = {
*/
.driver_features =
DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
@@ -298,7 +298,7 @@ not < 3.3.0.
.load = i915_driver_load,
.unload = i915_driver_unload,
.open = i915_driver_open,
-@@ -990,10 +994,12 @@ static struct drm_driver driver = {
+@@ -1041,10 +1045,12 @@ static struct drm_driver driver = {
.gem_free_object = i915_gem_free_object,
.gem_vm_ops = &i915_gem_vm_ops,
@@ -323,7 +323,7 @@ not < 3.3.0.
static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj);
static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj);
-@@ -3776,8 +3778,10 @@ void i915_gem_free_object(struct drm_gem
+@@ -3778,8 +3780,10 @@ void i915_gem_free_object(struct drm_gem
BUG_ON(obj->pages);
diff --git a/patches/drm/05-i915-define-acpi-video-class.patch b/patches/drm/05-i915-define-acpi-video-class.patch
index 49725af..cf7eb38 100644
--- a/patches/drm/05-i915-define-acpi-video-class.patch
+++ b/patches/drm/05-i915-define-acpi-video-class.patch
@@ -4,7 +4,7 @@ than 3.1.
--- 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
+@@ -307,6 +307,9 @@ static int intel_opregion_video_event(st
struct acpi_bus_event *event = data;
int ret = NOTIFY_OK;
diff --git a/patches/drm/09-nouveau-compatify-kconfig-vars.patch b/patches/drm/09-nouveau-compatify-kconfig-vars.patch
index d866006..ba46365 100644
--- a/patches/drm/09-nouveau-compatify-kconfig-vars.patch
+++ b/patches/drm/09-nouveau-compatify-kconfig-vars.patch
@@ -1,10 +1,8 @@
Rename CONFIG_NOUVEAU_DEBUG and CONFIG_NOUVEAU_DEBUG_DEFAULT to
CONFIG_COMPAT_*.
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/core/option.c
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/core/option.c
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/core/option.c
+--- a/drivers/gpu/drm/nouveau/core/core/option.c
++++ b/drivers/gpu/drm/nouveau/core/core/option.c
@@ -86,7 +86,7 @@ nouveau_boolopt(const char *optstr, cons
int
nouveau_dbgopt(const char *optstr, const char *sub)
@@ -14,10 +12,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/core/option.c
while (optstr) {
int len = strcspn(optstr, ",=");
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/client.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/client.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/client.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/client.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/client.h
@@ -15,7 +15,7 @@ struct nouveau_client {
static inline struct nouveau_client *
nv_client(void *obj)
@@ -27,10 +23,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/client.h
if (unlikely(!nv_iclass(obj, NV_CLIENT_CLASS)))
nv_assert("BAD CAST -> NvClient, %08x", nv_hclass(obj));
#endif
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/device.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/device.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/device.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/device.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/device.h
@@ -96,7 +96,7 @@ nv_device(void *obj)
if (device->parent)
device = device->parent;
@@ -40,10 +34,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/device.h
if (unlikely(!nv_iclass(device, NV_SUBDEV_CLASS) ||
(nv_hclass(device) & 0xff) != NVDEV_SUBDEV_DEVICE)) {
nv_assert("BAD CAST -> NvDevice, 0x%08x 0x%08x",
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/engctx.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/engctx.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/engctx.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/engctx.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/engctx.h
@@ -20,7 +20,7 @@ struct nouveau_engctx {
static inline struct nouveau_engctx *
nv_engctx(void *obj)
@@ -53,10 +45,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/engctx.h
if (unlikely(!nv_iclass(obj, NV_ENGCTX_CLASS)))
nv_assert("BAD CAST -> NvEngCtx, %08x", nv_hclass(obj));
#endif
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/engine.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/engine.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/engine.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/engine.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/engine.h
@@ -22,7 +22,7 @@ struct nouveau_engine {
static inline struct nouveau_engine *
nv_engine(void *obj)
@@ -66,10 +56,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/engine.h
if (unlikely(!nv_iclass(obj, NV_ENGINE_CLASS)))
nv_assert("BAD CAST -> NvEngine, %08x", nv_hclass(obj));
#endif
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
@@ -27,7 +27,7 @@ struct nouveau_gpuobj {
static inline struct nouveau_gpuobj *
nv_gpuobj(void *obj)
@@ -79,10 +67,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h
if (unlikely(!nv_iclass(obj, NV_GPUOBJ_CLASS)))
nv_assert("BAD CAST -> NvGpuObj, %08x", nv_hclass(obj));
#endif
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/namedb.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/namedb.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/namedb.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/namedb.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/namedb.h
@@ -14,7 +14,7 @@ struct nouveau_namedb {
static inline struct nouveau_namedb *
nv_namedb(void *obj)
@@ -92,10 +78,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/namedb.h
if (unlikely(!nv_iclass(obj, NV_NAMEDB_CLASS)))
nv_assert("BAD CAST -> NvNameDB, %08x", nv_hclass(obj));
#endif
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/object.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/object.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/object.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/object.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/object.h
@@ -20,7 +20,7 @@ struct nouveau_object {
struct nouveau_object *engine;
atomic_t refcount;
@@ -114,10 +98,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/object.h
if (likely(obj)) {
struct nouveau_object *object = obj;
if (unlikely(object->_magic != NOUVEAU_OBJECT_MAGIC))
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/parent.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/parent.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/parent.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/parent.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/parent.h
@@ -29,7 +29,7 @@ struct nouveau_parent {
static inline struct nouveau_parent *
nv_parent(void *obj)
@@ -127,10 +109,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/parent.h
if (unlikely(!(nv_iclass(obj, NV_PARENT_CLASS))))
nv_assert("BAD CAST -> NvParent, %08x", nv_hclass(obj));
#endif
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/printk.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/printk.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/printk.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/printk.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/printk.h
@@ -18,7 +18,7 @@ struct nouveau_object;
void nv_printk_(struct nouveau_object *, const char *, int, const char *, ...);
@@ -149,10 +129,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/printk.h
nv_printk_(NULL, NV_PRINTK_FATAL, NV_DBG_FATAL, f "\n", ##a); \
BUG_ON(1); \
} while(0)
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/subdev.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/core/subdev.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/core/subdev.h
+--- a/drivers/gpu/drm/nouveau/core/include/core/subdev.h
++++ b/drivers/gpu/drm/nouveau/core/include/core/subdev.h
@@ -20,7 +20,7 @@ struct nouveau_subdev {
static inline struct nouveau_subdev *
nv_subdev(void *obj)
@@ -162,10 +140,8 @@ Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/core/subdev.h
if (unlikely(!nv_iclass(obj, NV_SUBDEV_CLASS)))
nv_assert("BAD CAST -> NvSubDev, %08x", nv_hclass(obj));
#endif
-Index: compat-drivers/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
-+++ compat-drivers/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
+--- a/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
++++ b/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
@@ -16,7 +16,7 @@ struct nouveau_instobj {
static inline struct nouveau_instobj *
nv_memobj(void *obj)
diff --git a/patches/drm/10-radeon-revert-acpi-table-size-check.patch b/patches/drm/10-radeon-revert-acpi-table-size-check.patch
index d595a98..8adaeb3 100644
--- a/patches/drm/10-radeon-revert-acpi-table-size-check.patch
+++ b/patches/drm/10-radeon-revert-acpi-table-size-check.patch
@@ -1,10 +1,8 @@
acpi_get_table_with_size() was exported with kernels >= 3.6. Revert the
size checking for kernels < 3.6.
-Index: compat-drivers/drivers/gpu/drm/radeon/radeon_bios.c
-===================================================================
---- compat-drivers.orig/drivers/gpu/drm/radeon/radeon_bios.c
-+++ compat-drivers/drivers/gpu/drm/radeon/radeon_bios.c
+--- a/drivers/gpu/drm/radeon/radeon_bios.c
++++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -554,12 +554,21 @@ static bool radeon_acpi_vfct_bios(struct
{
bool ret = false;
diff --git a/patches/network/0001-netdev_ops.patch b/patches/network/0001-netdev_ops.patch
index 9453049..eb0c5a4 100644
--- a/patches/network/0001-netdev_ops.patch
+++ b/patches/network/0001-netdev_ops.patch
@@ -49,7 +49,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
if (unlikely(retval < 0)) {
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
-@@ -1420,7 +1420,7 @@ usbnet_probe (struct usb_interface *udev
+@@ -1422,7 +1422,7 @@ usbnet_probe (struct usb_interface *udev
net->features |= NETIF_F_HIGHDMA;
#endif
@@ -60,7 +60,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1285,7 +1285,7 @@ static const struct net_device_ops ath6k
+@@ -1322,7 +1322,7 @@ static const struct net_device_ops ath6k
void init_netdev(struct net_device *dev)
{
@@ -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
-@@ -3436,7 +3436,7 @@ static int rndis_wlan_bind(struct usbnet
+@@ -3442,7 +3442,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
-@@ -6106,7 +6106,7 @@ static struct net_device *ipw2100_alloc_
+@@ -6103,7 +6103,7 @@ static struct net_device *ipw2100_alloc_
priv->ieee->perfect_rssi = -20;
priv->ieee->worst_rssi = -85;
@@ -104,7 +104,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
priv->wireless_data.libipw = priv->ieee;
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
-@@ -11684,7 +11684,7 @@ static int ipw_prom_alloc(struct ipw_pri
+@@ -11690,7 +11690,7 @@ static int ipw_prom_alloc(struct ipw_pri
memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -113,7 +113,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;
SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
-@@ -11822,7 +11822,7 @@ static int __devinit ipw_pci_probe(struc
+@@ -11828,7 +11828,7 @@ static int __devinit ipw_pci_probe(struc
priv->ieee->perfect_rssi = -20;
priv->ieee->worst_rssi = -85;
@@ -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
-@@ -1299,7 +1299,7 @@ static const struct net_device_ops hwsim
+@@ -1601,7 +1601,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
-@@ -663,7 +663,7 @@ static const struct net_device_ops mwifi
+@@ -645,7 +645,7 @@ static const struct net_device_ops mwifi
void mwifiex_init_priv_params(struct mwifiex_private *priv,
struct net_device *dev)
{
@@ -168,7 +168,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800
priv->media_connected = false;
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
-@@ -224,7 +224,7 @@ void bnep_net_setup(struct net_device *d
+@@ -223,7 +223,7 @@ void bnep_net_setup(struct net_device *d
ether_setup(dev);
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -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
-@@ -993,7 +993,7 @@ static void ieee80211_if_setup(struct ne
+@@ -1008,7 +1008,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;
}
-@@ -1156,7 +1156,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1171,7 +1171,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;
}
-@@ -1191,7 +1191,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1206,7 +1206,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 1e22d60..b103c01 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
-@@ -994,6 +994,11 @@ static void ieee80211_if_setup(struct ne
+@@ -1009,6 +1009,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);
@@ -36,7 +36,7 @@ compile tested against older kernels.
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
-@@ -162,8 +162,12 @@ static int bnep_net_proto_filter(struct
+@@ -161,8 +161,12 @@ static int bnep_net_proto_filter(struct
}
#endif
diff --git a/patches/network/0003-netdev-needed_headroom_tailroom.patch b/patches/network/0003-netdev-needed_headroom_tailroom.patch
index 7322b9e..be60b19 100644
--- a/patches/network/0003-netdev-needed_headroom_tailroom.patch
+++ b/patches/network/0003-netdev-needed_headroom_tailroom.patch
@@ -4,7 +4,7 @@ could be used.
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1478,6 +1478,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1493,6 +1493,7 @@ int ieee80211_if_add(struct ieee80211_lo
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));
@@ -12,7 +12,7 @@ could be used.
ndev->needed_headroom = local->tx_headroom +
4*6 /* four MAC addresses */
+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1486,6 +1487,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1501,6 +1502,7 @@ int ieee80211_if_add(struct ieee80211_lo
- ETH_HLEN /* ethernet hard_header_len */
+ IEEE80211_ENCRYPT_HEADROOM;
ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
diff --git a/patches/network/04-netns.patch b/patches/network/04-netns.patch
index 4a8e049..1365b45 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
-@@ -5790,7 +5790,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5940,7 +5940,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)
{
-@@ -342,7 +344,9 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -344,7 +346,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),
-@@ -836,8 +840,10 @@ static int cfg80211_netdev_notifier_call
+@@ -843,8 +847,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")) {
-@@ -1028,6 +1034,7 @@ static struct notifier_block cfg80211_ne
+@@ -1035,6 +1041,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;
-@@ -1045,14 +1052,17 @@ static void __net_exit cfg80211_pernet_e
+@@ -1052,14 +1059,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)
-@@ -1087,8 +1097,10 @@ out_fail_nl80211:
+@@ -1094,8 +1104,10 @@ out_fail_nl80211:
out_fail_notifier:
wiphy_sysfs_exit();
out_fail_sysfs:
@@ -92,7 +92,7 @@ files...
return err;
}
subsys_initcall(cfg80211_init);
-@@ -1100,7 +1112,9 @@ static void __exit cfg80211_exit(void)
+@@ -1107,7 +1119,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 a92760a..518d233 100644
--- a/patches/network/08-rename-config-options.patch
+++ b/patches/network/08-rename-config-options.patch
@@ -30,6 +30,15 @@ CONFIG_BT_HIDP does not build with older kernel versions.
obj-$(CONFIG_RTL8180) += rtl818x/
obj-$(CONFIG_RTL8187) += rtl818x/
obj-$(CONFIG_RTLWIFI) += rtlwifi/
+@@ -53,7 +53,7 @@ obj-$(CONFIG_MAC80211_HWSIM) += mac80211
+
+ obj-$(CONFIG_WL_TI) += ti/
+
+-obj-$(CONFIG_MWIFIEX) += mwifiex/
++obj-$(CONFIG_COMPAT_MWIFIEX) += mwifiex/
+
+ obj-$(CONFIG_BRCMFMAC) += brcm80211/
+ obj-$(CONFIG_BRCMSMAC) += brcm80211/
--- a/drivers/net/wireless/iwlegacy/Makefile
+++ b/drivers/net/wireless/iwlegacy/Makefile
@@ -5,7 +5,7 @@ iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += d
@@ -115,7 +124,7 @@ CONFIG_BT_HIDP does not build with older kernel versions.
ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -764,7 +764,7 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -760,7 +760,7 @@ void ath9k_set_hw_capab(struct ath_softc
sc->ant_rx = hw->wiphy->available_antennas_rx;
sc->ant_tx = hw->wiphy->available_antennas_tx;
@@ -126,9 +135,9 @@ 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
-@@ -215,7 +215,7 @@ struct ath_rate_priv {
- struct ath_rc_stats rcstats[RATE_TABLE_SIZE];
- };
+@@ -231,7 +231,7 @@ static inline void ath_debug_stat_retrie
+ }
+ #endif
-#ifdef CONFIG_ATH9K_RATE_CONTROL
+#ifdef CONFIG_COMPAT_ATH9K_RATE_CONTROL
@@ -165,17 +174,6 @@ CONFIG_BT_HIDP does not build with older kernel versions.
lock_sock(sk);
err = rfcomm_dev_ioctl(sk, cmd, (void __user *) arg);
release_sock(sk);
---- a/drivers/net/wireless/Makefile
-+++ b/drivers/net/wireless/Makefile
-@@ -38,7 +38,7 @@ obj-$(CONFIG_MAC80211_HWSIM) += mac80211
-
- obj-$(CONFIG_WL_TI) += ti/
-
--obj-$(CONFIG_MWIFIEX) += mwifiex/
-+obj-$(CONFIG_COMPAT_MWIFIEX) += mwifiex/
-
- obj-$(CONFIG_BRCMFMAC) += brcm80211/
- obj-$(CONFIG_BRCMSMAC) += brcm80211/
--- a/drivers/net/wireless/mwifiex/Makefile
+++ b/drivers/net/wireless/mwifiex/Makefile
@@ -39,7 +39,7 @@ mwifiex-y += sta_rx.o
diff --git a/patches/network/09-cfg80211-wext-padding.patch b/patches/network/09-cfg80211-wext-padding.patch
index a0f47b3..5942cae 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
-@@ -2168,6 +2168,9 @@ struct wiphy_wowlan_support {
+@@ -2259,6 +2259,9 @@ struct wiphy_wowlan_support {
struct wiphy {
/* assign these fields before you register the wiphy */
diff --git a/patches/network/09-threaded-irq.patch b/patches/network/09-threaded-irq.patch
index 929d527..a7d2fe6 100644
--- a/patches/network/09-threaded-irq.patch
+++ b/patches/network/09-threaded-irq.patch
@@ -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
-@@ -5567,14 +5567,25 @@ static void wlcore_nvs_cb(const struct f
+@@ -5568,14 +5568,25 @@ static void wlcore_nvs_cb(const struct f
wl->set_power = pdata->set_power;
wl->if_ops = pdata->ops;
@@ -89,7 +89,7 @@ thread in process context as well.
if (ret < 0) {
wl1271_error("request_irq() failed: %d", ret);
goto out_free_nvs;
-@@ -5649,7 +5660,11 @@ out_unreg:
+@@ -5650,7 +5661,11 @@ out_unreg:
wl1271_unregister_hw(wl);
out_irq:
@@ -101,7 +101,7 @@ thread in process context as well.
out_free_nvs:
kfree(wl->nvs);
-@@ -5695,7 +5710,12 @@ int __devexit wlcore_remove(struct platf
+@@ -5696,7 +5711,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 16074e2..d9977d7 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
-@@ -343,10 +343,6 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -345,10 +345,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;
-@@ -864,6 +860,15 @@ static int cfg80211_netdev_notifier_call
+@@ -871,6 +867,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 2df8809..9001b52 100644
--- a/patches/network/11-dev-pm-ops.patch
+++ b/patches/network/11-dev-pm-ops.patch
@@ -109,7 +109,7 @@ calls on compat code with only slight modifications.
module_pci_driver(ath5k_pci_driver);
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -345,14 +345,10 @@ static int ath_pci_resume(struct device
+@@ -333,14 +333,10 @@ static int ath_pci_resume(struct device
return 0;
}
@@ -128,7 +128,7 @@ calls on compat code with only slight modifications.
#define ATH9K_PM_OPS (&ath9k_pm_ops)
-@@ -370,7 +366,12 @@ static struct pci_driver ath_pci_driver
+@@ -358,7 +354,12 @@ static struct pci_driver ath_pci_driver
.id_table = ath_pci_id_table,
.probe = ath_pci_probe,
.remove = ath_pci_remove,
@@ -210,7 +210,7 @@ calls on compat code with only slight modifications.
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
-@@ -339,6 +339,9 @@ static int iwl_pci_resume(struct device
+@@ -338,6 +338,9 @@ static int iwl_pci_resume(struct device
return iwl_trans_resume(iwl_trans);
}
@@ -220,7 +220,7 @@ calls on compat code with only slight modifications.
static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
#define IWL_PM_OPS (&iwl_dev_pm_ops)
-@@ -354,7 +357,12 @@ static struct pci_driver iwl_pci_driver
+@@ -353,7 +356,12 @@ static struct pci_driver iwl_pci_driver
.id_table = iwl_hw_card_ids,
.probe = iwl_pci_probe,
.remove = __devexit_p(iwl_pci_remove),
diff --git a/patches/network/12-iw_handler-changes.patch b/patches/network/12-iw_handler-changes.patch
index 5b54509..5b22ef8 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
-@@ -6109,7 +6109,11 @@ static struct net_device *ipw2100_alloc_
+@@ -6106,7 +6106,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/14-device-type.patch b/patches/network/14-device-type.patch
index cfe97b7..765a783 100644
--- a/patches/network/14-device-type.patch
+++ b/patches/network/14-device-type.patch
@@ -8,7 +8,7 @@ compile warning.
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
-@@ -796,9 +796,11 @@ void cfg80211_unregister_wdev(struct wir
+@@ -803,9 +803,11 @@ void cfg80211_unregister_wdev(struct wir
}
EXPORT_SYMBOL(cfg80211_unregister_wdev);
@@ -36,7 +36,7 @@ compile warning.
{
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
-@@ -1337,13 +1337,17 @@ static const struct net_device_ops usbne
+@@ -1339,13 +1339,17 @@ static const struct net_device_ops usbne
// precondition: never called in_interrupt
diff --git a/patches/network/15-symbol-export-conflicts.patch b/patches/network/15-symbol-export-conflicts.patch
index b222076..a836b94 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
-@@ -3144,7 +3144,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3203,7 +3203,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 d456750..8c690ae 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
+@@ -433,8 +433,12 @@ static struct sock *sco_sock_alloc(struc
return sk;
}
@@ -475,8 +475,8 @@ here still, but for now we keep this here.
{
struct sock *sk;
-@@ -662,7 +666,11 @@ static int sco_sock_sendmsg(struct kiocb
- return err;
+@@ -685,7 +689,11 @@ static int sco_sock_recvmsg(struct kiocb
+ return bt_sock_recvmsg(iocb, sock, msg, len, flags);
}
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
diff --git a/patches/network/17-netdev-queue.patch b/patches/network/17-netdev-queue.patch
index 9a1ef17..af10e5a 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
-@@ -1595,6 +1595,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1613,6 +1613,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;
-@@ -1622,6 +1623,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1640,6 +1641,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 d5c8ee2..3efa9e2 100644
--- a/patches/network/25-multicast-list_head.patch
+++ b/patches/network/25-multicast-list_head.patch
@@ -307,7 +307,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
}
--- a/drivers/net/wireless/mwifiex/debugfs.c
+++ b/drivers/net/wireless/mwifiex/debugfs.c
-@@ -216,7 +216,11 @@ mwifiex_info_read(struct file *file, cha
+@@ -217,7 +217,11 @@ mwifiex_info_read(struct file *file, cha
netdev_for_each_mc_addr(ha, netdev)
p += sprintf(p, "multicast_address[%d]=\"%pM\"\n",
@@ -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
-@@ -2567,15 +2567,21 @@ struct mwl8k_cmd_mac_multicast_adr {
+@@ -2574,15 +2574,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;
-@@ -2596,13 +2602,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
+@@ -2603,13 +2609,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
}
}
-@@ -4828,7 +4848,11 @@ mwl8k_bss_info_changed(struct ieee80211_
+@@ -4836,7 +4856,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;
-@@ -4839,7 +4863,11 @@ static u64 mwl8k_prepare_multicast(struc
+@@ -4847,7 +4871,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;
}
-@@ -4961,7 +4989,11 @@ static void mwl8k_configure_filter(struc
+@@ -4969,7 +4997,11 @@ static void mwl8k_configure_filter(struc
*/
if (*total_flags & FIF_ALLMULTI) {
kfree(cmd);
@@ -480,7 +480,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
return 1; /* update */
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
-@@ -1629,7 +1629,11 @@ static void set_multicast_list(struct us
+@@ -1632,7 +1632,11 @@ static void set_multicast_list(struct us
netdev_for_each_mc_addr(ha, usbdev->net)
memcpy(mc_addrs + i++ * ETH_ALEN,
@@ -637,7 +637,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
return hash.low | ((u64)hash.high << 32);
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
-@@ -132,7 +132,11 @@ static void _brcmf_set_multicast_list(st
+@@ -95,7 +95,11 @@ static void _brcmf_set_multicast_list(st
netdev_for_each_mc_addr(ha, ndev) {
if (!cnt)
break;
@@ -651,8 +651,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
}
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -2407,7 +2407,11 @@ struct ieee80211_ops {
- u32 changed);
+@@ -2494,7 +2494,11 @@ struct ieee80211_ops {
+ void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
u64 (*prepare_multicast)(struct ieee80211_hw *hw,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
@@ -665,7 +665,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
unsigned int *total_flags,
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
-@@ -94,8 +94,13 @@ static void bnep_net_set_mc_list(struct
+@@ -93,8 +93,13 @@ static void bnep_net_set_mc_list(struct
netdev_for_each_mc_addr(ha, dev) {
if (i == BNEP_MAX_MULTICAST_FILTERS)
break;
@@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -918,7 +918,12 @@ struct ieee80211_local {
+@@ -925,7 +925,12 @@ struct ieee80211_local {
struct work_struct reconfig_filter;
/* aggregated multicast list */
@@ -727,7 +727,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -728,8 +728,13 @@ static void ieee80211_do_stop(struct iee
+@@ -762,8 +762,13 @@ static void ieee80211_do_stop(struct iee
if (sdata->dev) {
netif_addr_lock_bh(sdata->dev);
spin_lock_bh(&local->filter_lock);
@@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
spin_unlock_bh(&local->filter_lock);
netif_addr_unlock_bh(sdata->dev);
-@@ -905,7 +910,12 @@ static void ieee80211_set_multicast_list
+@@ -920,7 +925,12 @@ static void ieee80211_set_multicast_list
sdata->flags ^= IEEE80211_SDATA_PROMISC;
}
spin_lock_bh(&local->filter_lock);
@@ -768,7 +768,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
spin_unlock_bh(&local->filter_lock);
/* be a bit nasty */
-@@ -637,9 +641,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -642,9 +646,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
INIT_LIST_HEAD(&local->interfaces);
@@ -782,7 +782,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1201,7 +1201,11 @@ static void ath6kl_set_multicast_list(st
+@@ -1238,7 +1238,11 @@ static void ath6kl_set_multicast_list(st
list_for_each_entry_safe(mc_filter, tmp, &vif->mc_filter, list) {
found = false;
netdev_for_each_mc_addr(ha, ndev) {
@@ -794,7 +794,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) {
found = true;
break;
-@@ -1235,7 +1239,11 @@ static void ath6kl_set_multicast_list(st
+@@ -1272,7 +1276,11 @@ static void ath6kl_set_multicast_list(st
netdev_for_each_mc_addr(ha, ndev) {
found = false;
list_for_each_entry(mc_filter, &vif->mc_filter, list) {
@@ -806,7 +806,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) {
found = true;
break;
-@@ -1250,7 +1258,11 @@ static void ath6kl_set_multicast_list(st
+@@ -1287,7 +1295,11 @@ static void ath6kl_set_multicast_list(st
goto out;
}
diff --git a/patches/network/26-sdio-quirks.patch b/patches/network/26-sdio-quirks.patch
index c6b19d3..0281c6b 100644
--- a/patches/network/26-sdio-quirks.patch
+++ b/patches/network/26-sdio-quirks.patch
@@ -2,7 +2,7 @@ The quirks attribute is not available on older kernels.
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
-@@ -852,6 +852,7 @@ static int if_sdio_power_on(struct if_sd
+@@ -873,6 +873,7 @@ static int if_sdio_power_on(struct if_sd
if (ret)
goto release;
@@ -10,7 +10,7 @@ The quirks attribute is not available on older kernels.
/* For 1-bit transfers to the 8686 model, we need to enable the
* interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0
* bit to allow access to non-vendor registers. */
-@@ -870,6 +871,7 @@ static int if_sdio_power_on(struct if_sd
+@@ -891,6 +892,7 @@ static int if_sdio_power_on(struct if_sd
if (ret)
goto disable;
}
diff --git a/patches/network/29-sdio_no_suspend.patch b/patches/network/29-sdio_no_suspend.patch
index 58b8360..b3654a2 100644
--- a/patches/network/29-sdio_no_suspend.patch
+++ b/patches/network/29-sdio_no_suspend.patch
@@ -13,7 +13,7 @@ suspend and resume that are not backported.
static int ath6kl_set_sdio_pm_caps(struct ath6kl *ar)
{
struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar);
-@@ -956,6 +957,17 @@ static int ath6kl_sdio_resume(struct ath
+@@ -940,6 +941,17 @@ static int ath6kl_sdio_resume(struct ath
return 0;
}
@@ -31,7 +31,7 @@ suspend and resume that are not backported.
/* set the window address register (using 4-byte register access ). */
static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr)
-@@ -1267,7 +1279,7 @@ static const struct ath6kl_hif_ops ath6k
+@@ -1251,7 +1263,7 @@ static const struct ath6kl_hif_ops ath6k
.stop = ath6kl_sdio_stop,
};
@@ -40,7 +40,7 @@ suspend and resume that are not backported.
/*
* Empty handlers so that mmc subsystem doesn't remove us entirely during
-@@ -1417,7 +1429,9 @@ static struct sdio_driver ath6kl_sdio_dr
+@@ -1401,7 +1413,9 @@ static struct sdio_driver ath6kl_sdio_dr
.id_table = ath6kl_sdio_devices,
.probe = ath6kl_sdio_probe,
.remove = ath6kl_sdio_remove,
@@ -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
-@@ -1320,6 +1320,7 @@ static void if_sdio_remove(struct sdio_f
+@@ -1341,6 +1341,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);
-@@ -1378,15 +1379,18 @@ static const struct dev_pm_ops if_sdio_p
+@@ -1399,15 +1400,18 @@ static const struct dev_pm_ops if_sdio_p
.suspend = if_sdio_suspend,
.resume = if_sdio_resume,
};
@@ -100,7 +100,7 @@ suspend and resume that are not backported.
/*
* SDIO suspend.
*
-@@ -254,6 +257,7 @@ static int mwifiex_sdio_resume(struct de
+@@ -255,6 +258,7 @@ static int mwifiex_sdio_resume(struct de
return 0;
}
@@ -108,7 +108,7 @@ suspend and resume that are not backported.
/* Device ID for SD8786 */
#define SDIO_DEVICE_ID_MARVELL_8786 (0x9116)
-@@ -272,10 +276,12 @@ static const struct sdio_device_id mwifi
+@@ -273,10 +277,12 @@ static const struct sdio_device_id mwifi
MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
@@ -121,7 +121,7 @@ suspend and resume that are not backported.
static struct sdio_driver mwifiex_sdio = {
.name = "mwifiex_sdio",
-@@ -284,7 +290,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -285,7 +291,9 @@ static struct sdio_driver mwifiex_sdio =
.remove = mwifiex_sdio_remove,
.drv = {
.owner = THIS_MODULE,
@@ -151,8 +151,8 @@ suspend and resume that are not backported.
int retry = 0;
while (atomic_read(&sdiodev->suspend) && retry++ != 30)
wait_event_timeout(*wq, false, HZ/100);
-@@ -542,7 +542,7 @@ static void brcmf_ops_sdio_remove(struct
- }
+@@ -550,7 +550,7 @@ static void brcmf_ops_sdio_remove(struct
+ brcmf_dbg(TRACE, "Exit\n");
}
-#ifdef CONFIG_PM_SLEEP
@@ -160,7 +160,7 @@ suspend and resume that are not backported.
static int brcmf_sdio_suspend(struct device *dev)
{
mmc_pm_flag_t sdio_flags;
-@@ -592,7 +592,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -600,7 +600,7 @@ static struct sdio_driver brcmf_sdmmc_dr
.remove = brcmf_ops_sdio_remove,
.name = "brcmfmac",
.id_table = brcmf_sdmmc_ids,
diff --git a/patches/network/30-bridge-port.patch b/patches/network/30-bridge-port.patch
index f1a93f6..b4106b7 100644
--- a/patches/network/30-bridge-port.patch
+++ b/patches/network/30-bridge-port.patch
@@ -34,7 +34,7 @@ compat-drivers.
ntype == NL80211_IFTYPE_P2P_CLIENT))
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -1888,7 +1888,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -2014,7 +2014,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 aad2401..f7a2b1a 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
-@@ -1176,6 +1176,10 @@ static void __exit ieee80211_exit(void)
+@@ -1194,6 +1194,10 @@ static void __exit ieee80211_exit(void)
rc80211_minstrel_ht_exit();
rc80211_minstrel_exit();
diff --git a/patches/network/40-netdev-hw-features.patch b/patches/network/40-netdev-hw-features.patch
index 3206057..605e97f 100644
--- a/patches/network/40-netdev-hw-features.patch
+++ b/patches/network/40-netdev-hw-features.patch
@@ -332,7 +332,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000
#endif /* ATLX_C */
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1112,6 +1112,7 @@ static struct net_device_stats *ath6kl_g
+@@ -1149,6 +1149,7 @@ static struct net_device_stats *ath6kl_g
return &vif->net_stats;
}
@@ -340,7 +340,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000
static int ath6kl_set_features(struct net_device *dev,
netdev_features_t features)
{
-@@ -1144,6 +1145,7 @@ static int ath6kl_set_features(struct ne
+@@ -1181,6 +1182,7 @@ static int ath6kl_set_features(struct ne
return err;
}
@@ -348,7 +348,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000
static void ath6kl_set_multicast_list(struct net_device *ndev)
{
-@@ -1291,7 +1293,9 @@ static const struct net_device_ops ath6k
+@@ -1328,7 +1330,9 @@ static const struct net_device_ops ath6k
.ndo_stop = ath6kl_close,
.ndo_start_xmit = ath6kl_data_tx,
.ndo_get_stats = ath6kl_get_stats,
@@ -358,7 +358,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000
.ndo_set_rx_mode = ath6kl_set_multicast_list,
};
-@@ -1306,7 +1310,11 @@ void init_netdev(struct net_device *dev)
+@@ -1343,7 +1347,11 @@ void init_netdev(struct net_device *dev)
sizeof(struct wmi_data_hdr) + HTC_HDR_LENGTH
+ WMI_MAX_TX_META_SZ + ATH6KL_HTC_ALIGN_BYTES;
diff --git a/patches/network/42-netlink_seq.patch b/patches/network/42-netlink_seq.patch
index 216e4aa..bb065ab 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
-@@ -4772,7 +4772,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -4910,7 +4910,9 @@ static int nl80211_dump_scan(struct sk_b
spin_lock_bh(&rdev->bss_lock);
cfg80211_bss_expire(rdev);
diff --git a/patches/network/46-use_other_workqueue.patch b/patches/network/46-use_other_workqueue.patch
index 7496b8c..16fa39b 100644
--- a/patches/network/46-use_other_workqueue.patch
+++ b/patches/network/46-use_other_workqueue.patch
@@ -4,7 +4,7 @@ position before.
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
-@@ -1691,8 +1691,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1789,8 +1789,12 @@ int hci_register_dev(struct hci_dev *hde
list_add(&hdev->list, &hci_dev_list);
write_unlock(&hci_dev_list_lock);
diff --git a/patches/network/54-get_ts_info.patch b/patches/network/54-get_ts_info.patch
index 5300b17..d28b39b 100644
--- a/patches/network/54-get_ts_info.patch
+++ b/patches/network/54-get_ts_info.patch
@@ -27,7 +27,7 @@ Date: Tue Apr 3 22:59:17 2012 +0000
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
-@@ -908,7 +908,9 @@ static const struct ethtool_ops usbnet_e
+@@ -910,7 +910,9 @@ static const struct ethtool_ops usbnet_e
.get_drvinfo = usbnet_get_drvinfo,
.get_msglevel = usbnet_get_msglevel,
.set_msglevel = usbnet_set_msglevel,
diff --git a/patches/network/62-usb_driver_lpm.patch b/patches/network/62-usb_driver_lpm.patch
index 59b34ee..02f18bb 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
-@@ -452,7 +452,9 @@ static struct usb_driver ath3k_driver =
+@@ -453,7 +453,9 @@ static struct usb_driver ath3k_driver =
.probe = ath3k_probe,
.disconnect = ath3k_disconnect,
.id_table = ath3k_table,
@@ -48,7 +48,7 @@
module_usb_driver(bpa10x_driver);
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
-@@ -1222,7 +1222,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,
@@ -84,7 +84,7 @@
module_usb_driver(rndis_driver);
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
-@@ -2458,7 +2458,9 @@ static struct usb_driver at76_driver = {
+@@ -2453,7 +2453,9 @@ static struct usb_driver at76_driver = {
.probe = at76_probe,
.disconnect = at76_disconnect,
.id_table = dev_table,
@@ -96,7 +96,7 @@
static int __init at76_mod_init(void)
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
-@@ -1191,7 +1191,9 @@ static struct usb_driver ath6kl_usb_driv
+@@ -1201,7 +1201,9 @@ static struct usb_driver ath6kl_usb_driv
.disconnect = ath6kl_usb_remove,
.id_table = ath6kl_usb_ids,
.supports_autosuspend = true,
@@ -132,9 +132,9 @@
module_usb_driver(carl9170_driver);
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
-@@ -1538,7 +1538,9 @@ static struct usb_driver brcmf_usbdrvr =
- .suspend = brcmf_usb_suspend,
+@@ -1502,7 +1502,9 @@ static struct usb_driver brcmf_usbdrvr =
.resume = brcmf_usb_resume,
+ .reset_resume = brcmf_usb_reset_resume,
.supports_autosuspend = 1,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
.disable_hub_initiated_lpm = 1,
@@ -192,7 +192,7 @@
module_usb_driver(p54u_driver);
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
-@@ -3755,7 +3755,9 @@ static struct usb_driver rndis_wlan_driv
+@@ -3761,7 +3761,9 @@ static struct usb_driver rndis_wlan_driv
.disconnect = usbnet_disconnect,
.suspend = usbnet_suspend,
.resume = usbnet_resume,
@@ -216,7 +216,7 @@
module_usb_driver(rt2500usb_driver);
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -1283,7 +1283,9 @@ static struct usb_driver rt2800usb_drive
+@@ -1284,7 +1284,9 @@ static struct usb_driver rt2800usb_drive
.suspend = rt2x00usb_suspend,
.resume = rt2x00usb_resume,
.reset_resume = rt2x00usb_resume,
@@ -252,7 +252,7 @@
module_usb_driver(rtl8187_driver);
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
-@@ -376,7 +376,9 @@ static struct usb_driver rtl8192cu_drive
+@@ -377,7 +377,9 @@ static struct usb_driver rtl8192cu_drive
#ifdef CONFIG_AUTOSUSPEND
.supports_autosuspend = 1,
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/6] compat-drivers: add import to fix compile error
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
` (3 preceding siblings ...)
2012-11-28 23:07 ` [PATCH 4/6] compat-drivers: refresh patches Hauke Mehrtens
@ 2012-11-28 23:07 ` Hauke Mehrtens
2012-11-29 19:25 ` Luis R. Rodriguez
2012-11-28 23:07 ` [PATCH 6/6] compat-drivers: do not use struct spinlock Hauke Mehrtens
5 siblings, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-28 23:07 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
On kernel version <= 2.6.28, I saw the following compile error without
this patch:
/net/wireless/util.c: In function ‘cfg80211_get_p2p_attr’:
/net/wireless/util.c:1120:4: error: implicit declaration of function
‘get_unaligned_le16’ [-Werror=implicit-function-declaration]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
| 10 ++++++++++
patches/network/30-bridge-port.patch | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
--git a/patches/network/06-header-changes.patch b/patches/network/06-header-changes.patch
index cd587cd..5da05c0 100644
--- a/patches/network/06-header-changes.patch
+++ b/patches/network/06-header-changes.patch
@@ -125,3 +125,13 @@ cases.
#define USB_VERSION "1.0"
+--- a/net/wireless/util.c
++++ b/net/wireless/util.c
+@@ -10,6 +10,7 @@
+ #include <net/cfg80211.h>
+ #include <net/ip.h>
+ #include <net/dsfield.h>
++#include <asm/unaligned.h>
+ #include "core.h"
+ #include "rdev-ops.h"
+
diff --git a/patches/network/30-bridge-port.patch b/patches/network/30-bridge-port.patch
index b4106b7..a426274 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
-@@ -812,7 +812,7 @@ int cfg80211_change_iface(struct cfg8021
+@@ -813,7 +813,7 @@ int cfg80211_change_iface(struct cfg8021
return -EOPNOTSUPP;
/* if it's part of a bridge, reject changing type to station/ibss */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 6/6] compat-drivers: do not use struct spinlock
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
` (4 preceding siblings ...)
2012-11-28 23:07 ` [PATCH 5/6] compat-drivers: add import to fix compile error Hauke Mehrtens
@ 2012-11-28 23:07 ` Hauke Mehrtens
2012-11-29 19:47 ` Luis R. Rodriguez
5 siblings, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-28 23:07 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
struct spinlock does not exists on kernel version <= 2.6.32, use
spinlock_t instead.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/network/67-use_spinlock_t.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 patches/network/67-use_spinlock_t.patch
diff --git a/patches/network/67-use_spinlock_t.patch b/patches/network/67-use_spinlock_t.patch
new file mode 100644
index 0000000..4c9f315
--- /dev/null
+++ b/patches/network/67-use_spinlock_t.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
++++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
+@@ -158,7 +158,7 @@ typedef int (*brcmf_fweh_handler_t)(stru
+ */
+ struct brcmf_fweh_info {
+ struct work_struct event_work;
+- struct spinlock evt_q_lock;
++ spinlock_t evt_q_lock;
+ struct list_head event_q;
+ int (*evt_handler[BRCMF_E_LAST])(struct brcmf_if *ifp,
+ const struct brcmf_event_msg *evtmsg,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 5/6] compat-drivers: add import to fix compile error
2012-11-28 23:07 ` [PATCH 5/6] compat-drivers: add import to fix compile error Hauke Mehrtens
@ 2012-11-29 19:25 ` Luis R. Rodriguez
2012-11-29 19:50 ` Hauke Mehrtens
0 siblings, 1 reply; 18+ messages in thread
From: Luis R. Rodriguez @ 2012-11-29 19:25 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: backports
On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> On kernel version <=3D 2.6.28, I saw the following compile error without
> this patch:
>
> /net/wireless/util.c: In function =E2=80=98cfg80211_get_p2p_attr=E2=80=99=
:
> /net/wireless/util.c:1120:4: error: implicit declaration of function
> =E2=80=98get_unaligned_le16=E2=80=99 [-Werror=3Dimplicit-function-declara=
tion]
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> patches/network/06-header-changes.patch | 10 ++++++++++
> patches/network/30-bridge-port.patch | 2 +-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/patches/network/06-header-changes.patch b/patches/network/06=
-header-changes.patch
> index cd587cd..5da05c0 100644
> --- a/patches/network/06-header-changes.patch
> +++ b/patches/network/06-header-changes.patch
> @@ -125,3 +125,13 @@ cases.
>
> #define USB_VERSION "1.0"
>
> +--- a/net/wireless/util.c
> ++++ b/net/wireless/util.c
> +@@ -10,6 +10,7 @@
> + #include <net/cfg80211.h>
> + #include <net/ip.h>
> + #include <net/dsfield.h>
> ++#include <asm/unaligned.h>
Interesting, I wonder if we should just get a compat header to add
this therefore not requiring any patching.
> + #include "core.h"
> + #include "rdev-ops.h"
> +
> diff --git a/patches/network/30-bridge-port.patch b/patches/network/30-br=
idge-port.patch
> index b4106b7..a426274 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
> -@@ -812,7 +812,7 @@ int cfg80211_change_iface(struct cfg8021
> +@@ -813,7 +813,7 @@ int cfg80211_change_iface(struct cfg8021
> return -EOPNOTSUPP;
>
This hunk does not seem to be relevant so I'll discard it.
Luis
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/6] compat-drivers: do not use struct spinlock
2012-11-28 23:07 ` [PATCH 6/6] compat-drivers: do not use struct spinlock Hauke Mehrtens
@ 2012-11-29 19:47 ` Luis R. Rodriguez
2012-11-29 20:51 ` Luis R. Rodriguez
0 siblings, 1 reply; 18+ messages in thread
From: Luis R. Rodriguez @ 2012-11-29 19:47 UTC (permalink / raw)
To: Hauke Mehrtens
Cc: backports, linux-kernel, Arend Van Spriel, linux-wireless,
Thomas Gleixner, Daniel Vetter, Srinidhi Kasagar, Linus Walleij,
Kyungmin Park, Sylwester Nawrocki, Alexander Stein
On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> struct spinlock does not exists on kernel version <= 2.6.32, use
> spinlock_t instead.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> patches/network/67-use_spinlock_t.patch | 11 +++++++++++
> 1 file changed, 11 insertions(+)
> create mode 100644 patches/network/67-use_spinlock_t.patch
>
> diff --git a/patches/network/67-use_spinlock_t.patch b/patches/network/67-use_spinlock_t.patch
> new file mode 100644
> index 0000000..4c9f315
> --- /dev/null
> +++ b/patches/network/67-use_spinlock_t.patch
> @@ -0,0 +1,11 @@
> +--- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
> ++++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
> +@@ -158,7 +158,7 @@ typedef int (*brcmf_fweh_handler_t)(stru
> + */
> + struct brcmf_fweh_info {
> + struct work_struct event_work;
> +- struct spinlock evt_q_lock;
> ++ spinlock_t evt_q_lock;
> + struct list_head event_q;
> + int (*evt_handler[BRCMF_E_LAST])(struct brcmf_if *ifp,
> + const struct brcmf_event_msg *evtmsg,
This should have still worked, I thought for a second based on your
backport patch we ditched the spinlock_t or perhaps this was related
to the realtime work Thomas has been doing but upon further inspection
I see now this is simply a discrepancy on sloppy driver development.
IMHO your patch should go upstream and a respective patch should be
submitted as well as for these drivers:
mcgrof@frijol ~/linux-next (git::master)$ git grep "struct spinlock" drivers/
drivers/crypto/ux500/cryp/cryp.h: struct spinlock ctx_lock;
drivers/crypto/ux500/cryp/cryp.h: struct spinlock power_state_spinlock;
drivers/crypto/ux500/hash/hash_alg.h: struct spinlock ctx_lock;
drivers/crypto/ux500/hash/hash_alg.h: struct spinlock
power_state_lock;
drivers/gpu/drm/i915/i915_drv.h: struct spinlock gt_lock;
drivers/gpu/drm/i915/i915_drv.h: struct spinlock lock;
drivers/media/platform/s5p-fimc/mipi-csis.c: struct spinlock slock;
drivers/media/platform/s5p-jpeg/jpeg-core.h: struct spinlock slock;
drivers/watchdog/ie6xx_wdt.c: struct spinlock unlock_sequence;
Alexander, please also add your driver to the MAINTAINERS file.
Luis
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 5/6] compat-drivers: add import to fix compile error
2012-11-29 19:25 ` Luis R. Rodriguez
@ 2012-11-29 19:50 ` Hauke Mehrtens
2012-11-29 19:57 ` Luis R. Rodriguez
0 siblings, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-29 19:50 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports
On 11/29/2012 08:25 PM, Luis R. Rodriguez wrote:
> On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> On kernel version <= 2.6.28, I saw the following compile error without
>> this patch:
>>
>> /net/wireless/util.c: In function ‘cfg80211_get_p2p_attr’:
>> /net/wireless/util.c:1120:4: error: implicit declaration of function
>> ‘get_unaligned_le16’ [-Werror=implicit-function-declaration]
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>> patches/network/06-header-changes.patch | 10 ++++++++++
>> patches/network/30-bridge-port.patch | 2 +-
>> 2 files changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/patches/network/06-header-changes.patch b/patches/network/06-header-changes.patch
>> index cd587cd..5da05c0 100644
>> --- a/patches/network/06-header-changes.patch
>> +++ b/patches/network/06-header-changes.patch
>> @@ -125,3 +125,13 @@ cases.
>>
>> #define USB_VERSION "1.0"
>>
>> +--- a/net/wireless/util.c
>> ++++ b/net/wireless/util.c
>> +@@ -10,6 +10,7 @@
>> + #include <net/cfg80211.h>
>> + #include <net/ip.h>
>> + #include <net/dsfield.h>
>> ++#include <asm/unaligned.h>
>
> Interesting, I wonder if we should just get a compat header to add
> this therefore not requiring any patching.
Probably some of the header files included also include asm/unaligned.h
on kernel versions > 2.6.28. You could add all the includes added in
this patch to compat-X.h to get rid of this entire patch, but this will
increase the risk of name clashes.
>> + #include "core.h"
>> + #include "rdev-ops.h"
>> +
>> diff --git a/patches/network/30-bridge-port.patch b/patches/network/30-bridge-port.patch
>> index b4106b7..a426274 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
>> -@@ -812,7 +812,7 @@ int cfg80211_change_iface(struct cfg8021
>> +@@ -813,7 +813,7 @@ int cfg80211_change_iface(struct cfg8021
>> return -EOPNOTSUPP;
>>
>
> This hunk does not seem to be relevant so I'll discard it.
The offset of this change in the patch changed because of the additional
header being added in the previous patch. I am always refreshing the
patches after doing some changes to them to make all apply cleanly.
Hauke
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 5/6] compat-drivers: add import to fix compile error
2012-11-29 19:50 ` Hauke Mehrtens
@ 2012-11-29 19:57 ` Luis R. Rodriguez
0 siblings, 0 replies; 18+ messages in thread
From: Luis R. Rodriguez @ 2012-11-29 19:57 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: backports
On Thu, Nov 29, 2012 at 11:50 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> On 11/29/2012 08:25 PM, Luis R. Rodriguez wrote:
>> On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote=
:
>>> On kernel version <=3D 2.6.28, I saw the following compile error withou=
t
>>> this patch:
>>>
>>> /net/wireless/util.c: In function =E2=80=98cfg80211_get_p2p_attr=E2=80=
=99:
>>> /net/wireless/util.c:1120:4: error: implicit declaration of function
>>> =E2=80=98get_unaligned_le16=E2=80=99 [-Werror=3Dimplicit-function-decla=
ration]
>>>
>>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>>> ---
>>> patches/network/06-header-changes.patch | 10 ++++++++++
>>> patches/network/30-bridge-port.patch | 2 +-
>>> 2 files changed, 11 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/patches/network/06-header-changes.patch b/patches/network/=
06-header-changes.patch
>>> index cd587cd..5da05c0 100644
>>> --- a/patches/network/06-header-changes.patch
>>> +++ b/patches/network/06-header-changes.patch
>>> @@ -125,3 +125,13 @@ cases.
>>>
>>> #define USB_VERSION "1.0"
>>>
>>> +--- a/net/wireless/util.c
>>> ++++ b/net/wireless/util.c
>>> +@@ -10,6 +10,7 @@
>>> + #include <net/cfg80211.h>
>>> + #include <net/ip.h>
>>> + #include <net/dsfield.h>
>>> ++#include <asm/unaligned.h>
>>
>> Interesting, I wonder if we should just get a compat header to add
>> this therefore not requiring any patching.
>
> Probably some of the header files included also include asm/unaligned.h
> on kernel versions > 2.6.28. You could add all the includes added in
> this patch to compat-X.h to get rid of this entire patch, but this will
> increase the risk of name clashes.
True.. I'll merge in for now and we can later try adding it and test
compiling, if we get no classes then we can move it upstream.
>>> + #include "core.h"
>>> + #include "rdev-ops.h"
>>> +
>>> diff --git a/patches/network/30-bridge-port.patch b/patches/network/30-=
bridge-port.patch
>>> index b4106b7..a426274 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
>>> -@@ -812,7 +812,7 @@ int cfg80211_change_iface(struct cfg8021
>>> +@@ -813,7 +813,7 @@ int cfg80211_change_iface(struct cfg8021
>>> return -EOPNOTSUPP;
>>>
>>
>> This hunk does not seem to be relevant so I'll discard it.
>
> The offset of this change in the patch changed because of the additional
> header being added in the previous patch. I am always refreshing the
> patches after doing some changes to them to make all apply cleanly.
Got it, I'd prefer we keep refreshes separate if possible given that I
think it'd be good we can keep track of automatic refreshes Vs manual
fixes required on patches between two releases. I'm a statistics
junky, but do think this can help in the long run to separate and
analyze the different types of changes required to keep doing
backporting.
Luis
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 6/6] compat-drivers: do not use struct spinlock
2012-11-29 19:47 ` Luis R. Rodriguez
@ 2012-11-29 20:51 ` Luis R. Rodriguez
0 siblings, 0 replies; 18+ messages in thread
From: Luis R. Rodriguez @ 2012-11-29 20:51 UTC (permalink / raw)
To: Hauke Mehrtens
Cc: backports, linux-kernel, Arend Van Spriel, linux-wireless,
Thomas Gleixner, Daniel Vetter, Srinidhi Kasagar, Linus Walleij,
Kyungmin Park, Sylwester Nawrocki, Alexander Stein
On Thu, Nov 29, 2012 at 11:47 AM, Luis R. Rodriguez
<mcgrof@do-not-panic.com> wrote:
> On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> IMHO your patch should go upstream and a respective patch should be
> submitted as well as for these drivers:
>
> mcgrof@frijol ~/linux-next (git::master)$ git grep "struct spinlock" drivers/
> drivers/crypto/ux500/cryp/cryp.h: struct spinlock ctx_lock;
> drivers/crypto/ux500/cryp/cryp.h: struct spinlock power_state_spinlock;
> drivers/crypto/ux500/hash/hash_alg.h: struct spinlock ctx_lock;
> drivers/crypto/ux500/hash/hash_alg.h: struct spinlock
> power_state_lock;
> drivers/gpu/drm/i915/i915_drv.h: struct spinlock gt_lock;
> drivers/gpu/drm/i915/i915_drv.h: struct spinlock lock;
> drivers/media/platform/s5p-fimc/mipi-csis.c: struct spinlock slock;
> drivers/media/platform/s5p-jpeg/jpeg-core.h: struct spinlock slock;
> drivers/watchdog/ie6xx_wdt.c: struct spinlock unlock_sequence;
>
> Alexander, please also add your driver to the MAINTAINERS file.
Hauke, I'll add your patch for now into compat-drivers until shit
catches up on linux-next if the series I just posted goes through.
Luis
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] compat-drivers: build RTL8723AE
2012-11-28 23:07 ` [PATCH 3/6] compat-drivers: build RTL8723AE Hauke Mehrtens
@ 2012-11-29 21:08 ` Luis R. Rodriguez
2012-11-29 21:21 ` Julia Lawall
2012-11-29 21:36 ` Julia Lawall
0 siblings, 2 replies; 18+ messages in thread
From: Luis R. Rodriguez @ 2012-11-29 21:08 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: backports, Julia Lawall
On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> This driver is building on all supported kernel versions.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Julia, just a heads up this is the only change that was required to
backport one 802.11 driver with the current framework. I don't believe
that the change below can be expressed in SmPL nor inferred into SmPL,
but wanted to double check with you.
Luis
> ---
> config.mk | 1 +
> patches/network/11-dev-pm-ops.patch | 33 +++++++++++++++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/config.mk b/config.mk
> index ae515bc..8513142 100644
> --- a/config.mk
> +++ b/config.mk
> @@ -433,6 +433,7 @@ endif #CONFIG_WIRELESS_EXT
> export CONFIG_RTL8192CE=m
> export CONFIG_RTL8192SE=m
> export CONFIG_RTL8192DE=m
> +export CONFIG_RTL8723AE=m
>
> export CONFIG_BRCMSMAC=m
>
> diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch
> index 206f34e..2df8809 100644
> --- a/patches/network/11-dev-pm-ops.patch
> +++ b/patches/network/11-dev-pm-ops.patch
> @@ -360,6 +360,39 @@ calls on compat code with only slight modifications.
> };
>
> module_pci_driver(rtl92se_driver);
> +--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
> ++++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
> +@@ -367,21 +367,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
> + MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
> + MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
> +
> +-static const struct dev_pm_ops rtlwifi_pm_ops = {
> +- .suspend = rtl_pci_suspend,
> +- .resume = rtl_pci_resume,
> +- .freeze = rtl_pci_suspend,
> +- .thaw = rtl_pci_resume,
> +- .poweroff = rtl_pci_suspend,
> +- .restore = rtl_pci_resume,
> +-};
> ++compat_pci_suspend(rtl_pci_suspend)
> ++compat_pci_resume(rtl_pci_resume)
> ++
> ++static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
> +
> + static struct pci_driver rtl8723ae_driver = {
> + .name = KBUILD_MODNAME,
> + .id_table = rtl8723ae_pci_ids,
> + .probe = rtl_pci_probe,
> + .remove = rtl_pci_disconnect,
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
> + .driver.pm = &rtlwifi_pm_ops,
> ++#elif defined(CONFIG_PM)
> ++ .suspend = rtl_pci_suspend_compat,
> ++ .resume = rtl_pci_resume_compat,
> ++#endif
> + };
> +
> + module_pci_driver(rtl8723ae_driver);
> --- a/drivers/net/wireless/p54/p54pci.c
> +++ b/drivers/net/wireless/p54/p54pci.c
> @@ -681,14 +681,10 @@ static int p54p_resume(struct device *de
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] compat-drivers: build RTL8723AE
2012-11-29 21:08 ` Luis R. Rodriguez
@ 2012-11-29 21:21 ` Julia Lawall
2012-11-29 21:30 ` Luis R. Rodriguez
2012-11-29 21:36 ` Julia Lawall
1 sibling, 1 reply; 18+ messages in thread
From: Julia Lawall @ 2012-11-29 21:21 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: Hauke Mehrtens, backports
On Thu, 29 Nov 2012, Luis R. Rodriguez wrote:
> On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> This driver is building on all supported kernel versions.
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>
> Julia, just a heads up this is the only change that was required to
> backport one 802.11 driver with the current framework. I don't believe
> that the change below can be expressed in SmPL nor inferred into SmPL,
> but wanted to double check with you.
Will it be needed to transform other drivers in this way?
In principle, these changes to data structures should be fine for SmPL. I
think you can even add the #ifdefs. The only thing that does not look
good to me is that compat_pci_suspend and compat_pci_suspend don't have
semicolons after them. Unlike eg module_pci_driver. Is there any reason
for this?
I don't think these changes would be inferred by spdiff, because of the
detail that it only works inside functions.
julia
> Luis
>
>> ---
>> config.mk | 1 +
>> patches/network/11-dev-pm-ops.patch | 33 +++++++++++++++++++++++++++++++++
>> 2 files changed, 34 insertions(+)
>>
>> diff --git a/config.mk b/config.mk
>> index ae515bc..8513142 100644
>> --- a/config.mk
>> +++ b/config.mk
>> @@ -433,6 +433,7 @@ endif #CONFIG_WIRELESS_EXT
>> export CONFIG_RTL8192CE=m
>> export CONFIG_RTL8192SE=m
>> export CONFIG_RTL8192DE=m
>> +export CONFIG_RTL8723AE=m
>>
>> export CONFIG_BRCMSMAC=m
>>
>> diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch
>> index 206f34e..2df8809 100644
>> --- a/patches/network/11-dev-pm-ops.patch
>> +++ b/patches/network/11-dev-pm-ops.patch
>> @@ -360,6 +360,39 @@ calls on compat code with only slight modifications.
>> };
>>
>> module_pci_driver(rtl92se_driver);
>> +--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
>> ++++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
>> +@@ -367,21 +367,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
>> + MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
>> + MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
>> +
>> +-static const struct dev_pm_ops rtlwifi_pm_ops = {
>> +- .suspend = rtl_pci_suspend,
>> +- .resume = rtl_pci_resume,
>> +- .freeze = rtl_pci_suspend,
>> +- .thaw = rtl_pci_resume,
>> +- .poweroff = rtl_pci_suspend,
>> +- .restore = rtl_pci_resume,
>> +-};
>> ++compat_pci_suspend(rtl_pci_suspend)
>> ++compat_pci_resume(rtl_pci_resume)
>> ++
>> ++static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
>> +
>> + static struct pci_driver rtl8723ae_driver = {
>> + .name = KBUILD_MODNAME,
>> + .id_table = rtl8723ae_pci_ids,
>> + .probe = rtl_pci_probe,
>> + .remove = rtl_pci_disconnect,
>> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
>> + .driver.pm = &rtlwifi_pm_ops,
>> ++#elif defined(CONFIG_PM)
>> ++ .suspend = rtl_pci_suspend_compat,
>> ++ .resume = rtl_pci_resume_compat,
>> ++#endif
>> + };
>> +
>> + module_pci_driver(rtl8723ae_driver);
>> --- a/drivers/net/wireless/p54/p54pci.c
>> +++ b/drivers/net/wireless/p54/p54pci.c
>> @@ -681,14 +681,10 @@ static int p54p_resume(struct device *de
>> --
>> 1.7.10.4
>>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] compat-drivers: build RTL8723AE
2012-11-29 21:21 ` Julia Lawall
@ 2012-11-29 21:30 ` Luis R. Rodriguez
0 siblings, 0 replies; 18+ messages in thread
From: Luis R. Rodriguez @ 2012-11-29 21:30 UTC (permalink / raw)
To: Julia Lawall; +Cc: Hauke Mehrtens, backports, Adrian Chadd
On Thu, Nov 29, 2012 at 1:21 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> On Thu, 29 Nov 2012, Luis R. Rodriguez wrote:
>
>> On Wed, Nov 28, 2012 at 3:07 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>>>
>>> This driver is building on all supported kernel versions.
>>>
>>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>>
>>
>> Julia, just a heads up this is the only change that was required to
>> backport one 802.11 driver with the current framework. I don't believe
>> that the change below can be expressed in SmPL nor inferred into SmPL,
>> but wanted to double check with you.
>
>
> Will it be needed to transform other drivers in this way?
Indeed the collection of changes for this collateral evolution is all
present in one patch:
patches/network/11-dev-pm-ops.patch
As it is right now all patches with double digits have not been split
out cleanly to *only* have present *one* collateral evolution. I
started doing this starting with the first series of patches the old
01-netdev-attach-ops.patcha and from this I split it up into four
patches:
0001-netdev_ops.patch
0002-net-misc.patch
0003-netdev-needed_headroom_tailroom.patch
0004-wext-namespace.patch
0005-netlink-portid.patch
So for example 0001-netdev_ops.patch has only one collateral evolution
which I have managed to infer SmPL using spdiff (but not yet
patchparse).
I suspect we can do the same with 11-dev-pm-ops.patch.
> In principle, these changes to data structures should be fine for SmPL.
Sweeeeeeeeeeeeeeet! Adding Adrian for #worlddomination
#killingproprietarydriver plans.
> I think you can even add the #ifdefs.
Mama mia.
> The only thing that does not look good
> to me is that compat_pci_suspend and compat_pci_suspend don't have
> semicolons after them. Unlike eg module_pci_driver. Is there any reason
> for this?
Um, well these unwrap to defining either a routine or nothing, so I
think adding one should be OK. I'll test compile that today and if it
works I'll add it.
> I don't think these changes would be inferred by spdiff, because of the
> detail that it only works inside functions.
Thought so, thanks for the confirmation, it clarifies the scope of
work required for these type of collateral evolutions.
Luis
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] compat-drivers: build RTL8723AE
2012-11-29 21:08 ` Luis R. Rodriguez
2012-11-29 21:21 ` Julia Lawall
@ 2012-11-29 21:36 ` Julia Lawall
2012-11-29 21:46 ` Hauke Mehrtens
1 sibling, 1 reply; 18+ messages in thread
From: Julia Lawall @ 2012-11-29 21:36 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: Hauke Mehrtens, backports
>> +-static const struct dev_pm_ops rtlwifi_pm_ops = {
>> +- .suspend = rtl_pci_suspend,
>> +- .resume = rtl_pci_resume,
>> +- .freeze = rtl_pci_suspend,
>> +- .thaw = rtl_pci_resume,
>> +- .poweroff = rtl_pci_suspend,
>> +- .restore = rtl_pci_resume,
>> +-};
So it often happens that eg all of suspend, freeze, and poweroff have the
same value?
julia
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] compat-drivers: build RTL8723AE
2012-11-29 21:36 ` Julia Lawall
@ 2012-11-29 21:46 ` Hauke Mehrtens
2012-11-29 21:53 ` Luis R. Rodriguez
0 siblings, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2012-11-29 21:46 UTC (permalink / raw)
To: Julia Lawall; +Cc: Luis R. Rodriguez, backports
On 11/29/2012 10:36 PM, Julia Lawall wrote:
>>> +-static const struct dev_pm_ops rtlwifi_pm_ops = {
>>> +- .suspend = rtl_pci_suspend,
>>> +- .resume = rtl_pci_resume,
>>> +- .freeze = rtl_pci_suspend,
>>> +- .thaw = rtl_pci_resume,
>>> +- .poweroff = rtl_pci_suspend,
>>> +- .restore = rtl_pci_resume,
>>> +-};
>
> So it often happens that eg all of suspend, freeze, and poweroff have
> the same value?
>
> julia
I will send a patch to replace them with SIMPLE_DEV_PM_OPS() upstream
for the wireless drivers, so this part of the patch will not be needed
any more in the future.
Hauke
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/6] compat-drivers: build RTL8723AE
2012-11-29 21:46 ` Hauke Mehrtens
@ 2012-11-29 21:53 ` Luis R. Rodriguez
0 siblings, 0 replies; 18+ messages in thread
From: Luis R. Rodriguez @ 2012-11-29 21:53 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: Julia Lawall, backports
On Thu, Nov 29, 2012 at 1:46 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> On 11/29/2012 10:36 PM, Julia Lawall wrote:
>>>> +-static const struct dev_pm_ops rtlwifi_pm_ops = {
>>>> +- .suspend = rtl_pci_suspend,
>>>> +- .resume = rtl_pci_resume,
>>>> +- .freeze = rtl_pci_suspend,
>>>> +- .thaw = rtl_pci_resume,
>>>> +- .poweroff = rtl_pci_suspend,
>>>> +- .restore = rtl_pci_resume,
>>>> +-};
>>
>> So it often happens that eg all of suspend, freeze, and poweroff have
>> the same value?
>>
>> julia
>
> I will send a patch to replace them with SIMPLE_DEV_PM_OPS() upstream
> for the wireless drivers, so this part of the patch will not be needed
> any more in the future.
Well that solves that :) look at that a new 802.11 driver magically
would be backported across releases with 0 changes required.
Luis
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2012-11-29 21:53 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-28 23:07 [PATCH 0/6] compat-drivers: fix problems introduced by changes in linux-next Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 1/6] compat-drivers: make patches apply again Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 2/6] compat-drivers: remove option for alx driver Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 3/6] compat-drivers: build RTL8723AE Hauke Mehrtens
2012-11-29 21:08 ` Luis R. Rodriguez
2012-11-29 21:21 ` Julia Lawall
2012-11-29 21:30 ` Luis R. Rodriguez
2012-11-29 21:36 ` Julia Lawall
2012-11-29 21:46 ` Hauke Mehrtens
2012-11-29 21:53 ` Luis R. Rodriguez
2012-11-28 23:07 ` [PATCH 4/6] compat-drivers: refresh patches Hauke Mehrtens
2012-11-28 23:07 ` [PATCH 5/6] compat-drivers: add import to fix compile error Hauke Mehrtens
2012-11-29 19:25 ` Luis R. Rodriguez
2012-11-29 19:50 ` Hauke Mehrtens
2012-11-29 19:57 ` Luis R. Rodriguez
2012-11-28 23:07 ` [PATCH 6/6] compat-drivers: do not use struct spinlock Hauke Mehrtens
2012-11-29 19:47 ` Luis R. Rodriguez
2012-11-29 20:51 ` Luis R. Rodriguez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.