From b060c7c4a841b72ee2922f0ad1acc362dfe3c08f Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 4 Mar 2013 17:16:11 -0800 Subject: [PATCH] compat-drivers: refresh patches for next-20130304 Signed-off-by: Luis R. Rodriguez --- .../network/0005-netlink-portid.patch | 50 +++++++++---------- .../network/04-netns.patch | 2 +- .../network/08-rename-config-options.patch | 2 +- .../network/09-threaded-irq.patch | 2 +- .../12-mac80211-disable-tx-status.patch | 4 +- .../network/22-multiqueue.patch | 2 +- .../network/26-sdio-quirks.patch | 4 +- .../network/29-sdio_no_suspend.patch | 4 +- .../network/30-bridge-port.patch | 2 +- .../network/42-netlink_seq.patch | 2 +- .../network/67-ipv6-dev-list.patch | 2 +- .../network/69-wowlan-no-socket.patch | 2 +- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/patches/collateral-evolutions/network/0005-netlink-portid.patch b/patches/collateral-evolutions/network/0005-netlink-portid.patch index 716c349682ef..e5a1ec18f5bc 100644 --- a/patches/collateral-evolutions/network/0005-netlink-portid.patch +++ b/patches/collateral-evolutions/network/0005-netlink-portid.patch @@ -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 -@@ -1393,7 +1393,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -1338,7 +1338,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--; -@@ -1416,7 +1416,7 @@ static int nl80211_get_wiphy(struct sk_b +@@ -1361,7 +1361,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; } -@@ -1995,7 +1995,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); -@@ -2026,7 +2026,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; -@@ -2251,7 +2251,7 @@ static int nl80211_new_interface(struct +@@ -2196,7 +2196,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; -@@ -2386,7 +2386,7 @@ static int nl80211_get_key(struct sk_buf +@@ -2331,7 +2331,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); -@@ -3321,7 +3321,7 @@ static int nl80211_dump_station(struct s +@@ -3266,7 +3266,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) -@@ -3367,7 +3367,7 @@ static int nl80211_get_station(struct sk +@@ -3312,7 +3312,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; -@@ -3913,7 +3913,7 @@ static int nl80211_dump_mpath(struct sk_ +@@ -3858,7 +3858,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) -@@ -3962,7 +3962,7 @@ static int nl80211_get_mpath(struct sk_b +@@ -3907,7 +3907,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; -@@ -4226,7 +4226,7 @@ static int nl80211_get_mesh_config(struc +@@ -4171,7 +4171,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; -@@ -4568,7 +4568,7 @@ static int nl80211_get_reg(struct sk_buf +@@ -4513,7 +4513,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; -@@ -5255,7 +5255,7 @@ static int nl80211_send_bss(struct sk_bu +@@ -5200,7 +5200,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; -@@ -5486,7 +5486,7 @@ static int nl80211_dump_survey(struct sk +@@ -5431,7 +5431,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) -@@ -6132,7 +6132,7 @@ static int nl80211_testmode_dump(struct +@@ -6077,7 +6077,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; -@@ -6211,7 +6211,7 @@ struct sk_buff *cfg80211_testmode_alloc_ +@@ -6156,7 +6156,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); } -@@ -6553,7 +6553,7 @@ static int nl80211_remain_on_channel(str +@@ -6498,7 +6498,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)) { -@@ -6772,7 +6772,7 @@ static int nl80211_register_mgmt(struct +@@ -6717,7 +6717,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])); } -@@ -6842,7 +6842,7 @@ static int nl80211_tx_mgmt(struct sk_buf +@@ -6787,7 +6787,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)) { -@@ -6957,7 +6957,7 @@ static int nl80211_get_power_save(struct +@@ -6902,7 +6902,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; -@@ -7246,7 +7246,7 @@ static int nl80211_get_wowlan(struct sk_ +@@ -7191,7 +7191,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; -@@ -7669,7 +7669,7 @@ static int nl80211_register_unexpected_f +@@ -7614,7 +7614,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; } -@@ -7699,7 +7699,7 @@ static int nl80211_probe_client(struct s +@@ -7644,7 +7644,7 @@ static int nl80211_probe_client(struct s if (!msg) return -ENOMEM; @@ -273,7 +273,7 @@ this one should other drivers / subsystem need this change. NL80211_CMD_PROBE_CLIENT); if (IS_ERR(hdr)) { -@@ -7743,13 +7743,13 @@ static int nl80211_register_beacons(stru +@@ -7688,13 +7688,13 @@ static int nl80211_register_beacons(stru /* First, check if already registered. */ spin_lock_bh(&rdev->beacon_registrations_lock); list_for_each_entry(reg, &rdev->beacon_registrations, list) { @@ -289,7 +289,7 @@ this one should other drivers / subsystem need this change. list_add(&nreg->list, &rdev->beacon_registrations); spin_unlock_bh(&rdev->beacon_registrations_lock); -@@ -10052,12 +10052,12 @@ static int nl80211_netlink_notify(struct +@@ -9997,12 +9997,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/04-netns.patch b/patches/collateral-evolutions/network/04-netns.patch index 53c17b3410d5..86c73d83c7ee 100644 --- a/patches/collateral-evolutions/network/04-netns.patch +++ b/patches/collateral-evolutions/network/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -6404,7 +6404,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -6349,7 +6349,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); diff --git a/patches/collateral-evolutions/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch index 977ef8996806..a13322744c50 100644 --- a/patches/collateral-evolutions/network/08-rename-config-options.patch +++ b/patches/collateral-evolutions/network/08-rename-config-options.patch @@ -159,7 +159,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. +rfcomm-$(CONFIG_COMPAT_BT_RFCOMM_TTY) += tty.o --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h -@@ -357,7 +357,7 @@ struct rfcomm_dev_list_req { +@@ -351,7 +351,7 @@ struct rfcomm_dev_list_req { int rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, void __user *arg); diff --git a/patches/collateral-evolutions/network/09-threaded-irq.patch b/patches/collateral-evolutions/network/09-threaded-irq.patch index 70eabb8aa68b..05bc541be9bc 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq.patch +++ b/patches/collateral-evolutions/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/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/iwlwifi/pcie/internal.h -@@ -286,6 +286,9 @@ struct iwl_trans_pcie { +@@ -295,6 +295,9 @@ struct iwl_trans_pcie { /*protect hw register */ spinlock_t reg_lock; diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch index ac336b496fde..9eefa861f8d4 100644 --- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch +++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch @@ -6,7 +6,7 @@ So we need to just ifdef this part out. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2010,6 +2010,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2031,6 +2031,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail_rcu; } @@ -14,7 +14,7 @@ So we need to just ifdef this part out. if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -2038,6 +2039,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2059,6 +2060,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/collateral-evolutions/network/22-multiqueue.patch b/patches/collateral-evolutions/network/22-multiqueue.patch index e4d4e1283c88..c18069b82617 100644 --- a/patches/collateral-evolutions/network/22-multiqueue.patch +++ b/patches/collateral-evolutions/network/22-multiqueue.patch @@ -30,7 +30,7 @@ in compat. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1502,6 +1502,10 @@ void ieee80211_xmit(struct ieee80211_sub +@@ -1508,6 +1508,10 @@ void ieee80211_xmit(struct ieee80211_sub } } diff --git a/patches/collateral-evolutions/network/26-sdio-quirks.patch b/patches/collateral-evolutions/network/26-sdio-quirks.patch index 0281c6bacc0a..d9340f612b51 100644 --- a/patches/collateral-evolutions/network/26-sdio-quirks.patch +++ b/patches/collateral-evolutions/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 -@@ -873,6 +873,7 @@ static int if_sdio_power_on(struct if_sd +@@ -877,6 +877,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. */ -@@ -891,6 +892,7 @@ static int if_sdio_power_on(struct if_sd +@@ -895,6 +896,7 @@ static int if_sdio_power_on(struct if_sd if (ret) goto disable; } diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend.patch index 0bc00fb2558f..6d95fe914e64 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend.patch @@ -52,7 +52,7 @@ suspend and resume that are not backported. static int __init ath6kl_sdio_init(void) --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -1341,6 +1341,7 @@ static void if_sdio_remove(struct sdio_f +@@ -1345,6 +1345,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); -@@ -1399,15 +1400,18 @@ static const struct dev_pm_ops if_sdio_p +@@ -1403,15 +1404,18 @@ static const struct dev_pm_ops if_sdio_p .suspend = if_sdio_suspend, .resume = if_sdio_resume, }; diff --git a/patches/collateral-evolutions/network/30-bridge-port.patch b/patches/collateral-evolutions/network/30-bridge-port.patch index 37c0e4623e09..7bd7a12e8ec6 100644 --- a/patches/collateral-evolutions/network/30-bridge-port.patch +++ b/patches/collateral-evolutions/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 -@@ -2069,7 +2069,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/collateral-evolutions/network/42-netlink_seq.patch b/patches/collateral-evolutions/network/42-netlink_seq.patch index 9c33f59ad5cc..0ce2f827a37c 100644 --- a/patches/collateral-evolutions/network/42-netlink_seq.patch +++ b/patches/collateral-evolutions/network/42-netlink_seq.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -5364,7 +5364,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -5309,7 +5309,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/67-ipv6-dev-list.patch b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch index 3fdbeb9b398a..96f45a9aa69a 100644 --- a/patches/collateral-evolutions/network/67-ipv6-dev-list.patch +++ b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch @@ -8,7 +8,7 @@ Date: Wed Mar 17 20:31:13 2010 +0000 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c -@@ -98,7 +98,11 @@ void iwl_mvm_ipv6_addr_change(struct iee +@@ -99,7 +99,11 @@ void iwl_mvm_ipv6_addr_change(struct iee int idx = 0; read_lock_bh(&idev->lock); diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch index 27d8f6ae99d8..54d66f69c2d4 100644 --- a/patches/collateral-evolutions/network/69-wowlan-no-socket.patch +++ b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch @@ -2,7 +2,7 @@ __sock_create() is not available on kernel version < 2.6.37. --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -7388,7 +7388,7 @@ static int nl80211_parse_wowlan_tcp(stru +@@ -7333,7 +7333,7 @@ static int nl80211_parse_wowlan_tcp(stru port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]); else port = 0; -- 2.30.2