summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-28 19:21:15 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-28 20:53:49 +0100
commitf512003b9ffec176e67f79b362c87b405962f4e9 (patch)
tree6cbb64b755c5e66e2a80d1526f3e76cf4a50d0ee /patches
parent13da9861852d8790abb8e64faa4ad48469ff6b59 (diff)
backports: refresh patches on v3.10.17
1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.98 [ OK ] 17 3.1.10 [ OK ] 18 3.10.14 [ FAIL ] 19 3.11.3 [ FAIL ] 20 3.12-rc3 [ FAIL ] 21 3.2.51 [ OK ] 22 3.3.8 [ OK ] 23 3.4.64 [ OK ] 24 3.5.7 [ OK ] 25 3.6.11 [ OK ] 26 3.7.10 [ OK ] 27 3.8.13 [ OK ] 28 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch2
-rw-r--r--patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch2
-rw-r--r--patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch2
-rw-r--r--patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch54
-rw-r--r--patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch4
-rw-r--r--patches/collateral-evolutions/network/05-usb/ath9k_htc.patch2
-rw-r--r--patches/collateral-evolutions/network/05-usb/p54usb.patch2
-rw-r--r--patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch2
-rw-r--r--patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch4
-rw-r--r--patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch2
-rw-r--r--patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch4
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch12
-rw-r--r--patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch2
-rw-r--r--patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch2
-rw-r--r--patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch14
-rw-r--r--patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch2
-rw-r--r--patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch2
-rw-r--r--patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch2
-rw-r--r--patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch2
-rw-r--r--patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch2
-rw-r--r--patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch2
-rw-r--r--patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch2
-rw-r--r--patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch2
-rw-r--r--patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch2
24 files changed, 64 insertions, 64 deletions
diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
index f3e50d28..3c6fe218 100644
--- a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
+++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch
@@ -1,6 +1,6 @@
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -4007,9 +4007,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -4043,9 +4043,14 @@ i915_gem_init_hw(struct drm_device *dev)
drm_i915_private_t *dev_priv = dev->dev_private;
int ret;
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch b/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch
index 5e0fb047..4ac2c5eb 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2470,7 +2470,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2508,7 +2508,7 @@ static int atl1c_init_netdev(struct net_
SET_NETDEV_DEV(netdev, &pdev->dev);
pci_set_drvdata(pdev, netdev);
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
index 9780e997..8ed22f0f 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
-@@ -654,7 +654,7 @@ static const struct net_device_ops mwifi
+@@ -639,7 +639,7 @@ static const struct net_device_ops mwifi
void mwifiex_init_priv_params(struct mwifiex_private *priv,
struct net_device *dev)
{
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
index b932ad90..11083702 100644
--- a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
+++ b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -1611,7 +1611,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1613,7 +1613,7 @@ static int nl80211_dump_wiphy(struct sk_
/* attempt to fit multiple wiphy data chunks into the skb */
do {
ret = nl80211_send_wiphy(dev, skb,
@@ -9,7 +9,7 @@
cb->nlh->nlmsg_seq,
NLM_F_MULTI,
split, &cb->args[1],
-@@ -1660,7 +1660,7 @@ static int nl80211_get_wiphy(struct sk_b
+@@ -1662,7 +1662,7 @@ static int nl80211_get_wiphy(struct sk_b
if (!msg)
return -ENOMEM;
@@ -18,7 +18,7 @@
false, NULL, NULL, NULL) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2240,7 +2240,7 @@ static int nl80211_dump_interface(struct
+@@ -2242,7 +2242,7 @@ static int nl80211_dump_interface(struct
if_idx++;
continue;
}
@@ -27,7 +27,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
rdev, wdev) < 0) {
mutex_unlock(&rdev->devlist_mtx);
-@@ -2271,7 +2271,7 @@ static int nl80211_get_interface(struct
+@@ -2273,7 +2273,7 @@ static int nl80211_get_interface(struct
if (!msg)
return -ENOMEM;
@@ -36,7 +36,7 @@
dev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2496,7 +2496,7 @@ static int nl80211_new_interface(struct
+@@ -2498,7 +2498,7 @@ static int nl80211_new_interface(struct
break;
}
@@ -45,7 +45,7 @@
rdev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2631,7 +2631,7 @@ static int nl80211_get_key(struct sk_buf
+@@ -2633,7 +2633,7 @@ static int nl80211_get_key(struct sk_buf
if (!msg)
return -ENOMEM;
@@ -54,7 +54,7 @@
NL80211_CMD_NEW_KEY);
if (IS_ERR(hdr))
return PTR_ERR(hdr);
-@@ -3572,7 +3572,7 @@ static int nl80211_dump_station(struct s
+@@ -3574,7 +3574,7 @@ static int nl80211_dump_station(struct s
goto out_err;
if (nl80211_send_station(skb,
@@ -63,7 +63,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
dev, wdev->netdev, mac_addr,
&sinfo) < 0)
-@@ -3618,7 +3618,7 @@ static int nl80211_get_station(struct sk
+@@ -3620,7 +3620,7 @@ static int nl80211_get_station(struct sk
if (!msg)
return -ENOMEM;
@@ -72,7 +72,7 @@
rdev, dev, mac_addr, &sinfo) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -4218,7 +4218,7 @@ static int nl80211_dump_mpath(struct sk_
+@@ -4220,7 +4220,7 @@ static int nl80211_dump_mpath(struct sk_
if (err)
goto out_err;
@@ -81,7 +81,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
wdev->netdev, dst, next_hop,
&pinfo) < 0)
-@@ -4267,7 +4267,7 @@ static int nl80211_get_mpath(struct sk_b
+@@ -4269,7 +4269,7 @@ static int nl80211_get_mpath(struct sk_b
if (!msg)
return -ENOMEM;
@@ -90,7 +90,7 @@
dev, dst, next_hop, &pinfo) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -4531,7 +4531,7 @@ static int nl80211_get_mesh_config(struc
+@@ -4533,7 +4533,7 @@ static int nl80211_get_mesh_config(struc
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
return -ENOMEM;
@@ -99,7 +99,7 @@
NL80211_CMD_GET_MESH_CONFIG);
if (!hdr)
goto out;
-@@ -4881,7 +4881,7 @@ static int nl80211_get_reg(struct sk_buf
+@@ -4883,7 +4883,7 @@ static int nl80211_get_reg(struct sk_buf
goto out;
}
@@ -108,7 +108,7 @@
NL80211_CMD_GET_REG);
if (!hdr)
goto put_failure;
-@@ -5581,7 +5581,7 @@ static int nl80211_send_bss(struct sk_bu
+@@ -5583,7 +5583,7 @@ static int nl80211_send_bss(struct sk_bu
ASSERT_WDEV_LOCK(wdev);
@@ -117,7 +117,7 @@
NL80211_CMD_NEW_SCAN_RESULTS);
if (!hdr)
return -1;
-@@ -5817,7 +5817,7 @@ static int nl80211_dump_survey(struct sk
+@@ -5819,7 +5819,7 @@ static int nl80211_dump_survey(struct sk
}
if (nl80211_send_survey(skb,
@@ -126,7 +126,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
wdev->netdev, &survey) < 0)
goto out;
-@@ -6475,7 +6475,7 @@ static int nl80211_testmode_dump(struct
+@@ -6477,7 +6477,7 @@ static int nl80211_testmode_dump(struct
}
while (1) {
@@ -135,7 +135,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
NL80211_CMD_TESTMODE);
struct nlattr *tmdata;
-@@ -6554,7 +6554,7 @@ struct sk_buff *cfg80211_testmode_alloc_
+@@ -6556,7 +6556,7 @@ struct sk_buff *cfg80211_testmode_alloc_
return NULL;
return __cfg80211_testmode_alloc_skb(rdev, approxlen,
@@ -144,7 +144,7 @@
rdev->testmode_info->snd_seq,
GFP_KERNEL);
}
-@@ -6914,7 +6914,7 @@ static int nl80211_remain_on_channel(str
+@@ -6918,7 +6918,7 @@ static int nl80211_remain_on_channel(str
if (!msg)
return -ENOMEM;
@@ -153,7 +153,7 @@
NL80211_CMD_REMAIN_ON_CHANNEL);
if (IS_ERR(hdr)) {
-@@ -7133,7 +7133,7 @@ static int nl80211_register_mgmt(struct
+@@ -7137,7 +7137,7 @@ static int nl80211_register_mgmt(struct
if (!rdev->ops->mgmt_tx)
return -EOPNOTSUPP;
@@ -162,7 +162,7 @@
nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]),
nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH]));
}
-@@ -7203,7 +7203,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -7207,7 +7207,7 @@ static int nl80211_tx_mgmt(struct sk_buf
if (!msg)
return -ENOMEM;
@@ -171,7 +171,7 @@
NL80211_CMD_FRAME);
if (IS_ERR(hdr)) {
-@@ -7318,7 +7318,7 @@ static int nl80211_get_power_save(struct
+@@ -7322,7 +7322,7 @@ static int nl80211_get_power_save(struct
if (!msg)
return -ENOMEM;
@@ -180,7 +180,7 @@
NL80211_CMD_GET_POWER_SAVE);
if (!hdr) {
err = -ENOBUFS;
-@@ -7612,7 +7612,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -7616,7 +7616,7 @@ static int nl80211_get_wowlan(struct sk_
if (!msg)
return -ENOMEM;
@@ -189,7 +189,7 @@
NL80211_CMD_GET_WOWLAN);
if (!hdr)
goto nla_put_failure;
-@@ -8036,7 +8036,7 @@ static int nl80211_register_unexpected_f
+@@ -8040,7 +8040,7 @@ static int nl80211_register_unexpected_f
if (wdev->ap_unexpected_nlportid)
return -EBUSY;
@@ -198,7 +198,7 @@
return 0;
}
-@@ -8066,7 +8066,7 @@ static int nl80211_probe_client(struct s
+@@ -8070,7 +8070,7 @@ static int nl80211_probe_client(struct s
if (!msg)
return -ENOMEM;
@@ -207,7 +207,7 @@
NL80211_CMD_PROBE_CLIENT);
if (IS_ERR(hdr)) {
-@@ -8110,13 +8110,13 @@ static int nl80211_register_beacons(stru
+@@ -8114,13 +8114,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) {
@@ -223,7 +223,7 @@
list_add(&nreg->list, &rdev->beacon_registrations);
spin_unlock_bh(&rdev->beacon_registrations_lock);
-@@ -8191,7 +8191,7 @@ static int nl80211_get_protocol_features
+@@ -8195,7 +8195,7 @@ static int nl80211_get_protocol_features
if (!msg)
return -ENOMEM;
@@ -232,7 +232,7 @@
NL80211_CMD_GET_PROTOCOL_FEATURES);
if (!hdr)
goto nla_put_failure;
-@@ -8266,7 +8266,7 @@ static int nl80211_crit_protocol_start(s
+@@ -8270,7 +8270,7 @@ static int nl80211_crit_protocol_start(s
ret = rdev_crit_proto_start(rdev, wdev, proto, duration);
if (!ret)
@@ -241,7 +241,7 @@
return ret;
}
-@@ -10672,12 +10672,12 @@ static int nl80211_netlink_notify(struct
+@@ -10677,12 +10677,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)
diff --git a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
index e19168a6..5728216e 100644
--- a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
+++ b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
@@ -28,7 +28,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -1618,6 +1618,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1620,6 +1620,7 @@ static int nl80211_dump_wiphy(struct sk_
&cb->args[2],
&cb->args[3]);
if (ret < 0) {
@@ -36,7 +36,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100
/*
* If sending the wiphy data didn't fit (ENOBUFS
* or EMSGSIZE returned), this SKB is still
-@@ -1638,6 +1639,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1640,6 +1641,7 @@ static int nl80211_dump_wiphy(struct sk_
mutex_unlock(&cfg80211_mutex);
return 1;
}
diff --git a/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
index a681f60d..cffa5617 100644
--- a/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
+++ b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1370,7 +1370,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1372,7 +1372,9 @@ static struct usb_driver ath9k_hif_usb_d
.reset_resume = ath9k_hif_usb_resume,
#endif
.id_table = ath9k_hif_usb_ids,
diff --git a/patches/collateral-evolutions/network/05-usb/p54usb.patch b/patches/collateral-evolutions/network/05-usb/p54usb.patch
index 7862af83..2e0fc28b 100644
--- a/patches/collateral-evolutions/network/05-usb/p54usb.patch
+++ b/patches/collateral-evolutions/network/05-usb/p54usb.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
-@@ -1137,7 +1137,9 @@ static struct usb_driver p54u_driver = {
+@@ -1138,7 +1138,9 @@ static struct usb_driver p54u_driver = {
.resume = p54u_resume,
.reset_resume = p54u_resume,
#endif /* CONFIG_PM */
diff --git a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
index 80a75a41..e785d7b8 100644
--- a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -11,7 +11,7 @@
device_initialize(&rdev->wiphy.dev);
rdev->wiphy.dev.class = &ieee80211_class;
rdev->wiphy.dev.platform_data = rdev;
-@@ -944,6 +940,15 @@ static int cfg80211_netdev_notifier_call
+@@ -945,6 +941,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/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
index d3a91341..f2d9aa9e 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2743,6 +2743,9 @@ static const struct pci_error_handlers a
+@@ -2781,6 +2781,9 @@ static const struct pci_error_handlers a
.resume = atl1c_io_resume,
};
@@ -10,7 +10,7 @@
static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
static struct pci_driver atl1c_driver = {
-@@ -2752,7 +2755,12 @@ static struct pci_driver atl1c_driver =
+@@ -2790,7 +2793,12 @@ static struct pci_driver atl1c_driver =
.remove = atl1c_remove,
.shutdown = atl1c_shutdown,
.err_handler = &atl1c_err_handler,
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch
index eda4d00f..68e9d41c 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -4935,8 +4935,17 @@ il_pci_resume(struct device *device)
+@@ -4936,8 +4936,17 @@ il_pci_resume(struct device *device)
return 0;
}
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch
index 6ab15661..87999059 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
-@@ -349,6 +349,9 @@ static int iwl_pci_resume(struct device
+@@ -350,6 +350,9 @@ static int iwl_pci_resume(struct device
return iwl_trans_resume(iwl_trans);
}
@@ -10,7 +10,7 @@
static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
#define IWL_PM_OPS (&iwl_dev_pm_ops)
-@@ -364,7 +367,12 @@ static struct pci_driver iwl_pci_driver
+@@ -365,7 +368,12 @@ static struct pci_driver iwl_pci_driver
.id_table = iwl_hw_card_ids,
.probe = iwl_pci_probe,
.remove = iwl_pci_remove,
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
index 7333764b..102b9361 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
-@@ -329,6 +329,7 @@ err:
+@@ -334,6 +334,7 @@ err:
return ret;
}
@@ -8,7 +8,7 @@
static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
unsigned char report_type)
{
-@@ -386,6 +387,16 @@ err:
+@@ -391,6 +392,16 @@ err:
mutex_unlock(&session->report_mutex);
return ret;
}
@@ -25,7 +25,7 @@
static void hidp_idle_timeout(unsigned long arg)
{
-@@ -674,6 +685,87 @@ static void hidp_close(struct hid_device
+@@ -679,6 +690,87 @@ static void hidp_close(struct hid_device
{
}
@@ -113,7 +113,7 @@
static int hidp_parse(struct hid_device *hid)
{
struct hidp_session *session = hid->driver_data;
-@@ -764,7 +856,9 @@ static int hidp_setup_hid(struct hidp_se
+@@ -769,7 +861,9 @@ static int hidp_setup_hid(struct hidp_se
hid->dev.parent = &session->conn->hcon->dev;
hid->ll_driver = &hidp_hid_driver;
@@ -123,7 +123,7 @@
hid->hid_output_raw_report = hidp_output_raw_report;
/* True if device is blacklisted in drivers/hid/hid-core.c */
-@@ -782,6 +876,7 @@ fault:
+@@ -787,6 +881,7 @@ fault:
return err;
}
@@ -131,7 +131,7 @@
/* initialize session devices */
static int hidp_session_dev_init(struct hidp_session *session,
-@@ -844,10 +939,17 @@ static int hidp_session_dev_add(struct h
+@@ -849,10 +944,17 @@ static int hidp_session_dev_add(struct h
/* remove HID/input devices from their bus systems */
static void hidp_session_dev_del(struct hidp_session *session)
{
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
index 84337c76..8abe17fb 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
@@ -1,6 +1,6 @@
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -2647,14 +2647,24 @@ struct ieee80211_ops {
+@@ -2648,14 +2648,24 @@ struct ieee80211_ops {
void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
u64 (*prepare_multicast)(struct ieee80211_hw *hw,
diff --git a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
index 0255fc76..eed7d15c 100644
--- a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -2316,7 +2316,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -2318,7 +2318,7 @@ static int nl80211_valid_4addr(struct cf
enum nl80211_iftype iftype)
{
if (!use_4addr) {
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
index f6736679..72d672b4 100644
--- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
@@ -1,14 +1,14 @@
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -491,6 +491,7 @@ static void atl1c_set_rxbufsize(struct a
- roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE;
+@@ -496,6 +496,7 @@ static void atl1c_set_rxbufsize(struct a
+ adapter->rx_frag_size = roundup_pow_of_two(head_size);
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
static netdev_features_t atl1c_fix_features(struct net_device *netdev,
netdev_features_t features)
{
-@@ -519,6 +520,7 @@ static int atl1c_set_features(struct net
+@@ -524,6 +525,7 @@ static int atl1c_set_features(struct net
return 0;
}
@@ -16,7 +16,7 @@
/**
* atl1c_change_mtu - Change the Maximum Transfer Unit
-@@ -551,8 +553,19 @@ static int atl1c_change_mtu(struct net_d
+@@ -556,8 +558,19 @@ static int atl1c_change_mtu(struct net_d
netdev->mtu = new_mtu;
adapter->hw.max_frame_size = new_mtu;
atl1c_set_rxbufsize(adapter, netdev);
@@ -36,7 +36,7 @@
atl1c_up(adapter);
clear_bit(__AT_RESETTING, &adapter->flags);
}
-@@ -2459,8 +2472,10 @@ static const struct net_device_ops atl1c
+@@ -2497,8 +2510,10 @@ static const struct net_device_ops atl1c
.ndo_set_mac_address = atl1c_set_mac_addr,
.ndo_set_rx_mode = atl1c_set_multi,
.ndo_change_mtu = atl1c_change_mtu,
@@ -47,7 +47,7 @@
.ndo_do_ioctl = atl1c_ioctl,
.ndo_tx_timeout = atl1c_tx_timeout,
.ndo_get_stats = atl1c_get_stats,
-@@ -2478,6 +2493,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2516,6 +2531,7 @@ static int atl1c_init_netdev(struct net_
netdev->watchdog_timeo = AT_TX_WATCHDOG;
atl1c_set_ethtool_ops(netdev);
@@ -55,7 +55,7 @@
/* TODO: add when ready */
netdev->hw_features = NETIF_F_SG |
NETIF_F_HW_CSUM |
-@@ -2486,6 +2502,14 @@ static int atl1c_init_netdev(struct net_
+@@ -2524,6 +2540,14 @@ static int atl1c_init_netdev(struct net_
NETIF_F_TSO6;
netdev->features = netdev->hw_features |
NETIF_F_HW_VLAN_CTAG_TX;
diff --git a/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch
index 9d32a62f..629c2147 100644
--- a/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -5692,7 +5692,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -5694,7 +5694,9 @@ static int nl80211_dump_scan(struct sk_b
spin_lock_bh(&rdev->bss_lock);
cfg80211_bss_expire(rdev);
diff --git a/patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch b/patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch
index 1e33058f..412e9146 100644
--- a/patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch
+++ b/patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
-@@ -2211,16 +2211,24 @@ int hci_register_dev(struct hci_dev *hde
+@@ -2222,16 +2222,24 @@ 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/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
index 103d8f5a..6494b84c 100644
--- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2622,7 +2622,9 @@ static int atl1c_probe(struct pci_dev *p
+@@ -2660,7 +2660,9 @@ static int atl1c_probe(struct pci_dev *p
}
if (atl1c_read_mac_addr(&adapter->hw)) {
/* got a random MAC address, set NET_ADDR_RANDOM to netdev */
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
index ce5b6d73..d70c24b3 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch
@@ -1,6 +1,6 @@
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
-@@ -473,7 +473,9 @@ static struct usb_driver ath3k_driver =
+@@ -503,7 +503,9 @@ static struct usb_driver ath3k_driver =
.probe = ath3k_probe,
.disconnect = ath3k_disconnect,
.id_table = ath3k_table,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
index e37f7265..547110c0 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch
@@ -1,6 +1,6 @@
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
-@@ -1619,7 +1619,9 @@ static struct usb_driver btusb_driver =
+@@ -1628,7 +1628,9 @@ static struct usb_driver btusb_driver =
#endif
.id_table = btusb_table,
.supports_autosuspend = 1,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch
index 148925e0..30804265 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
-@@ -740,7 +740,9 @@ static struct usb_driver cdc_driver = {
+@@ -745,7 +745,9 @@ static struct usb_driver cdc_driver = {
.resume = usbnet_resume,
.reset_resume = usbnet_resume,
.supports_autosuspend = 1,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch
index 6882f082..03ecbe5e 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1373,7 +1373,9 @@ static struct usb_driver ath9k_hif_usb_d
+@@ -1375,7 +1375,9 @@ static struct usb_driver ath9k_hif_usb_d
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
.soft_unbind = 1,
#endif
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch
index c419b276..4243672e 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_p54_p54usb.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
-@@ -1140,7 +1140,9 @@ static struct usb_driver p54u_driver = {
+@@ -1141,7 +1141,9 @@ static struct usb_driver p54u_driver = {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
.soft_unbind = 1,
#endif
diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
index ba0434be..67d7aa04 100644
--- a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -7755,7 +7755,7 @@ static int nl80211_parse_wowlan_tcp(stru
+@@ -7759,7 +7759,7 @@ static int nl80211_parse_wowlan_tcp(stru
port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]);
else
port = 0;