From: Johannes Berg Date: Thu, 4 Apr 2013 22:29:26 +0000 (+0200) Subject: refresh patches against next-20130328 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=30498b130cc0476e73f5142dcc63bc271da2d89b;p=openwrt%2Fstaging%2Fblogic.git refresh patches against next-20130328 The patches were last refreshed against that same tree, so the only change is that now we have -p in there, which results in changes like this (only): -@@ -1593,7 +1593,7 @@ +@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_ This makes the patches more readable. Signed-off-by: Johannes Berg --- diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch index c52f463964b0..5e0fb0470700 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch +++ b/patches/collateral-evolutions/network/0001-netdev_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 -@@ -2470,7 +2470,7 @@ +@@ -2470,7 +2470,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/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch index 4794c2285f0f..9c798eccab22 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -2207,7 +2207,7 @@ +@@ -2207,7 +2207,7 @@ static int atl1e_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/drivers_net_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl1.patch index 437b423bffa7..a261c25cc6b3 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl1.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl1.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -3009,7 +3009,7 @@ +@@ -3009,7 +3009,7 @@ static int atl1_probe(struct pci_dev *pd adapter->mii.phy_id_mask = 0x1f; adapter->mii.reg_num_mask = 0x1f; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl2.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl2.patch index b5024ea2abc7..7bbcb2b5a2c4 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl2.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atlx_atl2.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c -@@ -1396,7 +1396,7 @@ +@@ -1396,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pd atl2_setup_pcicmd(pdev); diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_broadcom_b44.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_broadcom_b44.patch index 2d44f7146041..0747b240b2af 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_broadcom_b44.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_broadcom_b44.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c -@@ -2170,7 +2170,7 @@ +@@ -2170,7 +2170,7 @@ static int b44_init_one(struct ssb_devic bp->rx_pending = B44_DEF_RX_RING_PENDING; bp->tx_pending = B44_DEF_TX_RING_PENDING; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_ath6kl_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_ath6kl_main.patch index d8e008e298eb..fe710da44ca7 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_ath6kl_main.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_ath6kl_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c -@@ -1289,7 +1289,7 @@ +@@ -1289,7 +1289,7 @@ static const struct net_device_ops ath6k void init_netdev(struct net_device *dev) { diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_wil6210_netdev.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_wil6210_netdev.patch index 78347abfd118..a2d032918aad 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_wil6210_netdev.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ath_wil6210_netdev.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/wil6210/netdev.c +++ b/drivers/net/wireless/ath/wil6210/netdev.c -@@ -76,7 +76,7 @@ +@@ -76,7 +76,7 @@ void *wil_if_alloc(struct device *dev, v goto out_priv; } diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2100.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2100.patch index 04042212079a..1cde9f466e8a 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2100.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2100.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6086,7 +6086,7 @@ +@@ -6086,7 +6086,7 @@ static struct net_device *ipw2100_alloc_ priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2200.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2200.patch index 98d01434309c..afa84cd238f0 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2200.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_ipw2x00_ipw2200.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c -@@ -11680,7 +11680,7 @@ +@@ -11680,7 +11680,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; @@ -9,7 +9,7 @@ priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev); -@@ -11818,7 +11818,7 @@ +@@ -11818,7 +11818,7 @@ static int ipw_pci_probe(struct pci_dev priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_main.patch index f77d30367ce6..bd5e2ae6687f 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_main.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -993,7 +993,7 @@ +@@ -993,7 +993,7 @@ struct lbs_private *lbs_add_card(void *c wdev->netdev = dev; priv->dev = dev; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_mesh.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_mesh.patch index 434f27bd778a..f7b1885583ad 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_mesh.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_libertas_mesh.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/mesh.c +++ b/drivers/net/wireless/libertas/mesh.c -@@ -1015,7 +1015,7 @@ +@@ -1015,7 +1015,7 @@ static int lbs_add_mesh(struct lbs_priva mesh_dev->ieee80211_ptr = mesh_wdev; priv->mesh_dev = mesh_dev; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mac80211_hwsim.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mac80211_hwsim.patch index c469227d8520..a9842b288e38 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mac80211_hwsim.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mac80211_hwsim.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1695,7 +1695,7 @@ +@@ -1695,7 +1695,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mwifiex_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mwifiex_main.patch index e34289ff0055..74f2c8e62f06 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mwifiex_main.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_mwifiex_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -654,7 +654,7 @@ +@@ -654,7 +654,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/0001-netdev_ops/drivers_net_wireless_orinoco_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_orinoco_main.patch index 563ed60bce34..e093a0bf7090 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_orinoco_main.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_orinoco_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c -@@ -2272,9 +2272,9 @@ +@@ -2272,9 +2272,9 @@ int orinoco_if_add(struct orinoco_privat #endif /* Default to standard ops if not set */ if (ops) diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_rndis_wlan.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_rndis_wlan.patch index 2c2d83909ac2..98facfb92082 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_rndis_wlan.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_wireless_rndis_wlan.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3438,7 +3438,7 @@ +@@ -3438,7 +3438,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. */ diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/net_bluetooth_bnep_netdev.patch b/patches/collateral-evolutions/network/0001-netdev_ops/net_bluetooth_bnep_netdev.patch index f445877b1595..3460e0c94522 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/net_bluetooth_bnep_netdev.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/net_bluetooth_bnep_netdev.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c -@@ -223,7 +223,7 @@ +@@ -223,7 +223,7 @@ void bnep_net_setup(struct net_device *d ether_setup(dev); dev->priv_flags &= ~IFF_TX_SKB_SHARING; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/net_mac80211_iface.patch b/patches/collateral-evolutions/network/0001-netdev_ops/net_mac80211_iface.patch index 8f44fe5f12bf..bb7023dcf4b1 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/net_mac80211_iface.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/net_mac80211_iface.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1017,7 +1017,7 @@ +@@ -1017,7 +1017,7 @@ static void ieee80211_if_setup(struct ne { ether_setup(dev); dev->priv_flags &= ~IFF_TX_SKB_SHARING; @@ -9,7 +9,7 @@ dev->destructor = free_netdev; } -@@ -1180,7 +1180,7 @@ +@@ -1180,7 +1180,7 @@ static void ieee80211_setup_sdata(struct /* only monitor/p2p-device differ */ if (sdata->dev) { @@ -18,7 +18,7 @@ sdata->dev->type = ARPHRD_ETHER; } -@@ -1218,7 +1218,7 @@ +@@ -1218,7 +1218,7 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/net_wireless_wext-core.patch b/patches/collateral-evolutions/network/0001-netdev_ops/net_wireless_wext-core.patch index df6c792fdbe1..30d7e127c340 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/net_wireless_wext-core.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/net_wireless_wext-core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c -@@ -925,9 +925,7 @@ +@@ -925,9 +925,7 @@ static int wireless_process_ioctl(struct return private(dev, iwr, cmd, info, handler); } /* Old driver API : call driver ioctl handler */ diff --git a/patches/collateral-evolutions/network/0002-net-misc/net_bluetooth_bnep_netdev.patch b/patches/collateral-evolutions/network/0002-net-misc/net_bluetooth_bnep_netdev.patch index 45deda6c3927..4bebe22e96eb 100644 --- a/patches/collateral-evolutions/network/0002-net-misc/net_bluetooth_bnep_netdev.patch +++ b/patches/collateral-evolutions/network/0002-net-misc/net_bluetooth_bnep_netdev.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c -@@ -161,8 +161,12 @@ +@@ -161,8 +161,12 @@ static int bnep_net_proto_filter(struct } #endif diff --git a/patches/collateral-evolutions/network/0002-net-misc/net_mac80211_iface.patch b/patches/collateral-evolutions/network/0002-net-misc/net_mac80211_iface.patch index 2033364de2dc..6eb86745b71e 100644 --- a/patches/collateral-evolutions/network/0002-net-misc/net_mac80211_iface.patch +++ b/patches/collateral-evolutions/network/0002-net-misc/net_mac80211_iface.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1018,6 +1018,11 @@ +@@ -1018,6 +1018,11 @@ static void ieee80211_if_setup(struct ne ether_setup(dev); dev->priv_flags &= ~IFF_TX_SKB_SHARING; netdev_attach_ops(dev, &ieee80211_dataif_ops); diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/drivers_net_wireless_orinoco_main.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/drivers_net_wireless_orinoco_main.patch index 4adf276480ab..94dc523e4bc6 100644 --- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/drivers_net_wireless_orinoco_main.patch +++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/drivers_net_wireless_orinoco_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c -@@ -2279,7 +2279,11 @@ +@@ -2279,7 +2279,11 @@ int orinoco_if_add(struct orinoco_privat /* we use the default eth_mac_addr for setting the MAC addr */ /* Reserve space in skb for the SNAP header */ diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/net_mac80211_iface.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/net_mac80211_iface.patch index cc9aae45c06c..2b6a8a46dd5b 100644 --- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/net_mac80211_iface.patch +++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/net_mac80211_iface.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1518,6 +1518,7 @@ +@@ -1518,6 +1518,7 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -8,7 +8,7 @@ ndev->needed_headroom = local->tx_headroom + 4*6 /* four MAC addresses */ + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ -@@ -1526,6 +1527,7 @@ +@@ -1526,6 +1527,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/collateral-evolutions/network/0004-wext-namespace/net_wireless_wext-core.patch b/patches/collateral-evolutions/network/0004-wext-namespace/net_wireless_wext-core.patch index 2d257c6948a6..d7e18b6e1084 100644 --- a/patches/collateral-evolutions/network/0004-wext-namespace/net_wireless_wext-core.patch +++ b/patches/collateral-evolutions/network/0004-wext-namespace/net_wireless_wext-core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c -@@ -342,6 +342,7 @@ +@@ -342,6 +342,7 @@ static const int compat_event_type_size[ /* IW event code */ @@ -8,7 +8,7 @@ static int __net_init wext_pernet_init(struct net *net) { skb_queue_head_init(&net->wext_nlevents); -@@ -384,6 +385,29 @@ +@@ -384,6 +385,29 @@ static void wireless_nlevent_process(str static DECLARE_WORK(wireless_nlevent_work, wireless_nlevent_process); @@ -38,7 +38,7 @@ static struct nlmsghdr *rtnetlink_ifinfo_prep(struct net_device *dev, struct sk_buff *skb) { -@@ -597,8 +621,13 @@ +@@ -597,8 +621,13 @@ void wireless_send_event(struct net_devi skb_shinfo(skb)->frag_list = compskb; #endif diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/drivers_net_wireless_mac80211_hwsim.patch b/patches/collateral-evolutions/network/0005-netlink-portid/drivers_net_wireless_mac80211_hwsim.patch index 1f8d82b8e1d7..c1ab942321c7 100644 --- a/patches/collateral-evolutions/network/0005-netlink-portid/drivers_net_wireless_mac80211_hwsim.patch +++ b/patches/collateral-evolutions/network/0005-netlink-portid/drivers_net_wireless_mac80211_hwsim.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -2019,10 +2019,10 @@ +@@ -2019,10 +2019,10 @@ static int hwsim_register_received_nl(st if (info == NULL) goto out; @@ -13,7 +13,7 @@ return 0; out: -@@ -2059,7 +2059,7 @@ +@@ -2059,7 +2059,7 @@ static int mac80211_hwsim_netlink_notify if (state != NETLINK_URELEASE) return NOTIFY_DONE; diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/net_wireless_nl80211.patch index 3e39a4df7b00..0e2b9818d085 100644 --- a/patches/collateral-evolutions/network/0005-netlink-portid/net_wireless_nl80211.patch +++ b/patches/collateral-evolutions/network/0005-netlink-portid/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1593,7 +1593,7 @@ +@@ -1593,7 +1593,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], -@@ -1642,7 +1642,7 @@ +@@ -1642,7 +1642,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; -@@ -2222,7 +2222,7 @@ +@@ -2222,7 +2222,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); -@@ -2253,7 +2253,7 @@ +@@ -2253,7 +2253,7 @@ static int nl80211_get_interface(struct if (!msg) return -ENOMEM; @@ -36,7 +36,7 @@ dev, wdev) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2478,7 +2478,7 @@ +@@ -2478,7 +2478,7 @@ static int nl80211_new_interface(struct break; } @@ -45,7 +45,7 @@ rdev, wdev) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2613,7 +2613,7 @@ +@@ -2613,7 +2613,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); -@@ -3549,7 +3549,7 @@ +@@ -3549,7 +3549,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, netdev, mac_addr, &sinfo) < 0) -@@ -3595,7 +3595,7 @@ +@@ -3595,7 +3595,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; -@@ -4195,7 +4195,7 @@ +@@ -4195,7 +4195,7 @@ static int nl80211_dump_mpath(struct sk_ if (err) goto out_err; @@ -81,7 +81,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, netdev, dst, next_hop, &pinfo) < 0) -@@ -4244,7 +4244,7 @@ +@@ -4244,7 +4244,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; -@@ -4508,7 +4508,7 @@ +@@ -4508,7 +4508,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; -@@ -4858,7 +4858,7 @@ +@@ -4858,7 +4858,7 @@ static int nl80211_get_reg(struct sk_buf goto out; } @@ -108,7 +108,7 @@ NL80211_CMD_GET_REG); if (!hdr) goto put_failure; -@@ -5558,7 +5558,7 @@ +@@ -5558,7 +5558,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; -@@ -5789,7 +5789,7 @@ +@@ -5789,7 +5789,7 @@ static int nl80211_dump_survey(struct sk } if (nl80211_send_survey(skb, @@ -126,7 +126,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, netdev, &survey) < 0) -@@ -6448,7 +6448,7 @@ +@@ -6448,7 +6448,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; -@@ -6527,7 +6527,7 @@ +@@ -6527,7 +6527,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); } -@@ -6887,7 +6887,7 @@ +@@ -6887,7 +6887,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)) { -@@ -7106,7 +7106,7 @@ +@@ -7106,7 +7106,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])); } -@@ -7176,7 +7176,7 @@ +@@ -7176,7 +7176,7 @@ static int nl80211_tx_mgmt(struct sk_buf if (!msg) return -ENOMEM; @@ -171,7 +171,7 @@ NL80211_CMD_FRAME); if (IS_ERR(hdr)) { -@@ -7291,7 +7291,7 @@ +@@ -7291,7 +7291,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; -@@ -7583,7 +7583,7 @@ +@@ -7583,7 +7583,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; -@@ -8007,7 +8007,7 @@ +@@ -8007,7 +8007,7 @@ static int nl80211_register_unexpected_f if (wdev->ap_unexpected_nlportid) return -EBUSY; @@ -198,7 +198,7 @@ return 0; } -@@ -8037,7 +8037,7 @@ +@@ -8037,7 +8037,7 @@ static int nl80211_probe_client(struct s if (!msg) return -ENOMEM; @@ -207,7 +207,7 @@ NL80211_CMD_PROBE_CLIENT); if (IS_ERR(hdr)) { -@@ -8081,13 +8081,13 @@ +@@ -8081,13 +8081,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); -@@ -8160,7 +8160,7 @@ +@@ -8160,7 +8160,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; -@@ -10565,12 +10565,12 @@ +@@ -10565,12 +10565,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/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/net_wireless_nl80211.patch index 6dc8c3303e10..974d5803f17f 100644 --- a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/net_wireless_nl80211.patch +++ b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1600,6 +1600,7 @@ +@@ -1600,6 +1600,7 @@ static int nl80211_dump_wiphy(struct sk_ &cb->args[2], &cb->args[3]); if (ret < 0) { @@ -8,7 +8,7 @@ /* * If sending the wiphy data didn't fit (ENOBUFS * or EMSGSIZE returned), this SKB is still -@@ -1620,6 +1621,7 @@ +@@ -1620,6 +1621,7 @@ static int nl80211_dump_wiphy(struct sk_ mutex_unlock(&cfg80211_mutex); return 1; } diff --git a/patches/collateral-evolutions/network/02-ksize/drivers_net_wireless_orinoco_wext.patch b/patches/collateral-evolutions/network/02-ksize/drivers_net_wireless_orinoco_wext.patch index 1bf1ac5b53c6..75e081946505 100644 --- a/patches/collateral-evolutions/network/02-ksize/drivers_net_wireless_orinoco_wext.patch +++ b/patches/collateral-evolutions/network/02-ksize/drivers_net_wireless_orinoco_wext.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c -@@ -31,8 +31,22 @@ +@@ -31,8 +31,22 @@ static int orinoco_set_key(struct orinoc enum orinoco_alg alg, const u8 *key, int key_len, const u8 *seq, int seq_len) { diff --git a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_core.patch b/patches/collateral-evolutions/network/03-rfkill/net_rfkill_core.patch index 689c6c9a93ce..406ae534dcc1 100644 --- a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_core.patch +++ b/patches/collateral-evolutions/network/03-rfkill/net_rfkill_core.patch @@ -1,6 +1,6 @@ --- a/net/rfkill/core.c +++ b/net/rfkill/core.c -@@ -826,7 +826,7 @@ +@@ -826,7 +826,7 @@ static int rfkill_resume(struct device * } static struct class rfkill_class = { diff --git a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_input.patch b/patches/collateral-evolutions/network/03-rfkill/net_rfkill_input.patch index 0304be5bca1c..947c43752de6 100644 --- a/patches/collateral-evolutions/network/03-rfkill/net_rfkill_input.patch +++ b/patches/collateral-evolutions/network/03-rfkill/net_rfkill_input.patch @@ -1,6 +1,6 @@ --- a/net/rfkill/input.c +++ b/net/rfkill/input.c -@@ -230,7 +230,7 @@ +@@ -230,7 +230,7 @@ static int rfkill_connect(struct input_h handle->dev = dev; handle->handler = handler; diff --git a/patches/collateral-evolutions/network/04-netns/net_wireless_core.patch b/patches/collateral-evolutions/network/04-netns/net_wireless_core.patch index 08d440e4ed75..3fe83ddfbfd1 100644 --- a/patches/collateral-evolutions/network/04-netns/net_wireless_core.patch +++ b/patches/collateral-evolutions/network/04-netns/net_wireless_core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -160,6 +160,7 @@ +@@ -160,6 +160,7 @@ int cfg80211_dev_rename(struct cfg80211_ return 0; } @@ -8,7 +8,7 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev, struct net *net) { -@@ -204,6 +205,7 @@ +@@ -204,6 +205,7 @@ int cfg80211_switch_netns(struct cfg8021 return 0; } @@ -16,7 +16,7 @@ static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data) { -@@ -372,7 +374,9 @@ +@@ -372,7 +374,9 @@ struct wiphy *wiphy_new(const struct cfg rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT; #endif @@ -26,7 +26,7 @@ rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), -@@ -919,8 +923,10 @@ +@@ -919,8 +923,10 @@ static int cfg80211_netdev_notifier_call wdev->identifier = ++rdev->wdev_id; list_add_rcu(&wdev->list, &rdev->wdev_list); rdev->devlist_generation++; @@ -37,7 +37,7 @@ if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -1081,6 +1087,7 @@ +@@ -1081,6 +1087,7 @@ static struct notifier_block cfg80211_ne .notifier_call = cfg80211_netdev_notifier_call, }; @@ -45,7 +45,7 @@ static void __net_exit cfg80211_pernet_exit(struct net *net) { struct cfg80211_registered_device *rdev; -@@ -1098,14 +1105,17 @@ +@@ -1098,14 +1105,17 @@ static void __net_exit cfg80211_pernet_e static struct pernet_operations cfg80211_pernet_ops = { .exit = cfg80211_pernet_exit, }; @@ -63,7 +63,7 @@ err = wiphy_sysfs_init(); if (err) -@@ -1142,8 +1152,10 @@ +@@ -1142,8 +1152,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -74,7 +74,7 @@ return err; } subsys_initcall(cfg80211_init); -@@ -1155,7 +1167,9 @@ +@@ -1155,7 +1167,9 @@ static void __exit cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/collateral-evolutions/network/04-netns/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/04-netns/net_wireless_nl80211.patch index ed189bad60d5..b011cf39b0cb 100644 --- a/patches/collateral-evolutions/network/04-netns/net_wireless_nl80211.patch +++ b/patches/collateral-evolutions/network/04-netns/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -6740,7 +6740,9 @@ +@@ -6740,7 +6740,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/04-netns/net_wireless_wext-core.patch b/patches/collateral-evolutions/network/04-netns/net_wireless_wext-core.patch index 3f62024aa016..6b995e4bbd8d 100644 --- a/patches/collateral-evolutions/network/04-netns/net_wireless_wext-core.patch +++ b/patches/collateral-evolutions/network/04-netns/net_wireless_wext-core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c -@@ -367,6 +367,7 @@ +@@ -367,6 +367,7 @@ static int __init wireless_nlevent_init( subsys_initcall(wireless_nlevent_init); /* Process events generated by the wireless layer or the driver. */ @@ -8,7 +8,7 @@ static void wireless_nlevent_process(struct work_struct *work) { struct sk_buff *skb; -@@ -382,6 +383,20 @@ +@@ -382,6 +383,20 @@ static void wireless_nlevent_process(str rtnl_unlock(); } diff --git a/patches/collateral-evolutions/network/04-netns/net_wireless_wext-proc.patch b/patches/collateral-evolutions/network/04-netns/net_wireless_wext-proc.patch index 73420e34b147..de6f664c7427 100644 --- a/patches/collateral-evolutions/network/04-netns/net_wireless_wext-proc.patch +++ b/patches/collateral-evolutions/network/04-netns/net_wireless_wext-proc.patch @@ -1,6 +1,6 @@ --- a/net/wireless/wext-proc.c +++ b/net/wireless/wext-proc.c -@@ -98,7 +98,11 @@ +@@ -98,7 +98,11 @@ static void *wireless_dev_seq_start(stru return SEQ_START_TOKEN; off = 1; diff --git a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch b/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch index 96077326354d..a681f60dd77e 100644 --- a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch +++ b/patches/collateral-evolutions/network/05-usb/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 -@@ -1370,7 +1370,9 @@ +@@ -1370,7 +1370,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/drivers_net_wireless_p54_p54usb.patch b/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch index 4662b0209ddc..7862af83da05 100644 --- a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch +++ b/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c -@@ -1137,7 +1137,9 @@ +@@ -1137,7 +1137,9 @@ static struct usb_driver p54u_driver = { .resume = p54u_resume, .reset_resume = p54u_resume, #endif /* CONFIG_PM */ diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h index 0661f90d423f..fa828678c9da 100644 --- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h +++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.h @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -2561,6 +2561,9 @@ +@@ -2561,6 +2561,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch index 064e15713671..051401afd4cd 100644 --- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch +++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -316,6 +316,17 @@ +@@ -316,6 +316,17 @@ struct wiphy *wiphy_new(const struct cfg struct cfg80211_registered_device *rdev; int alloc_size; diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h index a4e66cad8856..8889d233b0a9 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -872,6 +872,9 @@ +@@ -872,6 +872,9 @@ struct b43_wldev { unsigned int tx_count; unsigned int rx_count; #endif diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch index 16a638fd8ef6..c2a434407e03 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -4243,8 +4243,13 @@ +@@ -4243,8 +4243,13 @@ redo: if (b43_bus_host_is_sdio(dev->dev)) { b43_sdio_free_irq(dev); } else { @@ -14,7 +14,7 @@ } mutex_lock(&wl->mutex); dev = wl->current_dev; -@@ -4290,9 +4295,17 @@ +@@ -4290,9 +4295,17 @@ static int b43_wireless_core_start(struc goto out; } } else { @@ -32,7 +32,7 @@ if (err) { b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq); -@@ -5115,6 +5128,10 @@ +@@ -5115,6 +5128,10 @@ static int b43_setup_bands(struct b43_wl static void b43_wireless_core_detach(struct b43_wldev *dev) { diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h index a89d0d50f97d..3666d99519c1 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/iwlwifi/pcie/internal.h -@@ -311,6 +311,9 @@ +@@ -311,6 +311,9 @@ struct iwl_trans_pcie { /*protect hw register */ spinlock_t reg_lock; diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch index 600ebd668a3c..c4d6dda97c0c 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -773,12 +773,21 @@ +@@ -773,12 +773,21 @@ void iwl_trans_pcie_free(struct iwl_tran { struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); @@ -22,7 +22,7 @@ iwl_pcie_free_ict(trans); pci_disable_msi(trans_pcie->pci_dev); -@@ -1566,9 +1575,16 @@ +@@ -1566,9 +1575,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s if (iwl_pcie_alloc_ict(trans)) goto out_free_cmd_pool; diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch index f04c7d023aa9..0e925b149c36 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -6054,13 +6054,24 @@ +@@ -6054,13 +6054,24 @@ static void wlcore_nvs_cb(const struct f wl->platform_quirks = pdata->platform_quirks; wl->if_ops = pdev_data->if_ops; @@ -25,7 +25,7 @@ if (ret < 0) { wl1271_error("request_irq() failed: %d", ret); goto out_free_nvs; -@@ -6135,7 +6146,11 @@ +@@ -6135,7 +6146,11 @@ out_unreg: wl1271_unregister_hw(wl); out_irq: @@ -37,7 +37,7 @@ out_free_nvs: kfree(wl->nvs); -@@ -6181,7 +6196,12 @@ +@@ -6181,7 +6196,12 @@ int wlcore_remove(struct platform_device disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl); diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h index 1731cf7078b5..67e0bc1a0ee6 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wlcore/wlcore.h +++ b/drivers/net/wireless/ti/wlcore/wlcore.h -@@ -175,7 +175,9 @@ +@@ -175,7 +175,9 @@ struct wl1271 { bool initialized; struct ieee80211_hw *hw; bool mac80211_registered; 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 916c595600b3..b047c32311e2 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 @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -373,10 +373,6 @@ +@@ -373,10 +373,6 @@ struct wiphy *wiphy_new(const struct cfg INIT_WORK(&rdev->sched_scan_results_wk, __cfg80211_sched_scan_results); INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk, cfg80211_dfs_channels_update_work); @@ -11,7 +11,7 @@ device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -947,6 +943,15 @@ +@@ -947,6 +943,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_bcma_host_pci.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch index 3ad0153d1b40..1b9b57882720 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_bcma_host_pci.patch @@ -1,6 +1,6 @@ --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c -@@ -257,6 +257,9 @@ +@@ -257,6 +257,9 @@ static int bcma_host_pci_resume(struct d return bcma_bus_resume(bus); } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, bcma_host_pci_resume); #define BCMA_PM_OPS (&bcma_pm_ops) -@@ -285,7 +288,12 @@ +@@ -285,7 +288,12 @@ static struct pci_driver bcma_pci_bridge .id_table = bcma_pci_bridge_tbl, .probe = bcma_host_pci_probe, .remove = bcma_host_pci_remove, 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 70753ec29057..d3a913418a4a 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 @@ +@@ -2743,6 +2743,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 @@ +@@ -2752,7 +2755,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_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch index 5886923cca50..1e3cb6d67e68 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atlx_atl1.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -2877,6 +2877,9 @@ +@@ -2877,6 +2877,9 @@ static int atl1_resume(struct device *de return 0; } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume); #define ATL1_PM_OPS (&atl1_pm_ops) -@@ -3147,7 +3150,12 @@ +@@ -3147,7 +3150,12 @@ static struct pci_driver atl1_driver = { .probe = atl1_probe, .remove = atl1_remove, .shutdown = atl1_shutdown, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath5k_pci.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath5k_pci.patch index 860a02acee83..bdcfbadae1ed 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath5k_pci.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath5k_pci.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath5k/pci.c +++ b/drivers/net/wireless/ath/ath5k/pci.c -@@ -326,6 +326,9 @@ +@@ -326,6 +326,9 @@ static int ath5k_pci_resume(struct devic return 0; } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume); #define ATH5K_PM_OPS (&ath5k_pm_ops) #else -@@ -337,7 +340,12 @@ +@@ -337,7 +340,12 @@ static struct pci_driver ath5k_pci_drive .id_table = ath5k_pci_id_table, .probe = ath5k_pci_probe, .remove = ath5k_pci_remove, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch index 16107a15a92a..7d00628a8c26 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -310,6 +310,9 @@ +@@ -310,6 +310,9 @@ static int ath_pci_resume(struct device return 0; } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume); #define ATH9K_PM_OPS (&ath9k_pm_ops) -@@ -328,7 +331,12 @@ +@@ -328,7 +331,12 @@ static struct pci_driver ath_pci_driver .id_table = ath_pci_id_table, .probe = ath_pci_probe, .remove = ath_pci_remove, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_3945-mac.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_3945-mac.patch index 973d06b34e05..573933d08f5c 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_3945-mac.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_3945-mac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c -@@ -3909,7 +3909,12 @@ +@@ -3909,7 +3909,12 @@ static struct pci_driver il3945_driver = .id_table = il3945_hw_card_ids, .probe = il3945_pci_probe, .remove = il3945_pci_remove, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch index 776b8a54bd32..9073d052fc84 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -6803,7 +6803,12 @@ +@@ -6803,7 +6803,12 @@ static struct pci_driver il4965_driver = .id_table = il4965_hw_card_ids, .probe = il4965_pci_probe, .remove = il4965_pci_remove, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h index e81cc7cd3051..c9a27033cc90 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_common.h @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h -@@ -1833,7 +1833,14 @@ +@@ -1833,7 +1833,14 @@ __le32 il_add_beacon_time(struct il_priv u32 beacon_interval); #ifdef CONFIG_PM 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 70af6aa0ea85..d59c31b2925b 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 @@ +@@ -4935,8 +4935,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 4c2a2742fc86..8e9e9afda90f 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 -@@ -347,6 +347,9 @@ +@@ -347,6 +347,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) -@@ -362,7 +365,12 @@ +@@ -362,7 +365,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/11-dev-pm-ops/drivers_net_wireless_libertas_if_spi.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_libertas_if_spi.patch index 7f6312c4f052..3512436c3a5b 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_libertas_if_spi.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_libertas_if_spi.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c -@@ -1249,6 +1249,7 @@ +@@ -1249,6 +1249,7 @@ static int libertas_spi_remove(struct sp return 0; } @@ -8,7 +8,7 @@ static int if_spi_suspend(struct device *dev) { struct spi_device *spi = to_spi_device(dev); -@@ -1282,6 +1283,7 @@ +@@ -1282,6 +1283,7 @@ static const struct dev_pm_ops if_spi_pm .suspend = if_spi_suspend, .resume = if_spi_resume, }; @@ -16,7 +16,7 @@ static struct spi_driver libertas_spi_driver = { .probe = if_spi_probe, -@@ -1289,7 +1291,9 @@ +@@ -1289,7 +1291,9 @@ static struct spi_driver libertas_spi_dr .driver = { .name = "libertas_spi", .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_p54_p54pci.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_p54_p54pci.patch index 833de297914e..b95afec7afc9 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_p54_p54pci.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_p54_p54pci.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c -@@ -684,6 +684,9 @@ +@@ -684,6 +684,9 @@ static int p54p_resume(struct device *de return pci_set_power_state(pdev, PCI_D0); } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(p54pci_pm_ops, p54p_suspend, p54p_resume); #define P54P_PM_OPS (&p54pci_pm_ops) -@@ -696,7 +699,12 @@ +@@ -696,7 +699,12 @@ static struct pci_driver p54p_driver = { .id_table = p54p_table, .probe = p54p_probe, .remove = p54p_remove, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch index e03a4b1da7cc..e297248b91bf 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c -@@ -372,6 +372,9 @@ +@@ -372,6 +372,9 @@ 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)"); @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); static struct pci_driver rtl92ce_driver = { -@@ -379,7 +382,12 @@ +@@ -379,7 +382,12 @@ static struct pci_driver rtl92ce_driver .id_table = rtl92ce_pci_ids, .probe = rtl_pci_probe, .remove = rtl_pci_disconnect, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192de_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192de_sw.patch index 071398d0a280..1adbc2e700d0 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192de_sw.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192de_sw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c -@@ -378,6 +378,9 @@ +@@ -378,6 +378,9 @@ 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)"); @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); static struct pci_driver rtl92de_driver = { -@@ -385,7 +388,12 @@ +@@ -385,7 +388,12 @@ static struct pci_driver rtl92de_driver .id_table = rtl92de_pci_ids, .probe = rtl_pci_probe, .remove = rtl_pci_disconnect, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch index acb2ff1ee1bb..52225549a743 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c -@@ -429,6 +429,9 @@ +@@ -429,6 +429,9 @@ 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)"); @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); static struct pci_driver rtl92se_driver = { -@@ -436,7 +439,12 @@ +@@ -436,7 +439,12 @@ static struct pci_driver rtl92se_driver .id_table = rtl92se_pci_ids, .probe = rtl_pci_probe, .remove = rtl_pci_disconnect, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch index 0fc2fe2b0bab..32eca2d56d19 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8723ae_sw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c -@@ -367,6 +367,9 @@ +@@ -367,6 +367,9 @@ 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)"); @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); static struct pci_driver rtl8723ae_driver = { -@@ -374,7 +377,12 @@ +@@ -374,7 +377,12 @@ static struct pci_driver rtl8723ae_drive .id_table = rtl8723ae_pci_ids, .probe = rtl_pci_probe, .remove = rtl_pci_disconnect, diff --git a/patches/collateral-evolutions/network/12-iw_handler-changes/drivers_net_wireless_ipw2x00_ipw2100.patch b/patches/collateral-evolutions/network/12-iw_handler-changes/drivers_net_wireless_ipw2x00_ipw2100.patch index b5622e3a5cde..d7a6a6dd5e1b 100644 --- a/patches/collateral-evolutions/network/12-iw_handler-changes/drivers_net_wireless_ipw2x00_ipw2100.patch +++ b/patches/collateral-evolutions/network/12-iw_handler-changes/drivers_net_wireless_ipw2x00_ipw2100.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6089,7 +6089,11 @@ +@@ -6089,7 +6089,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/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch index f5aeb8361961..5e92069e6fcd 100644 --- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2035,6 +2035,7 @@ +@@ -2035,6 +2035,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail_rcu; } @@ -8,7 +8,7 @@ if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -2063,6 +2064,7 @@ +@@ -2063,6 +2064,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/collateral-evolutions/network/14-device-type/net_bluetooth_bnep_core.patch b/patches/collateral-evolutions/network/14-device-type/net_bluetooth_bnep_core.patch index d8954e4254cd..2ba08a9b81f3 100644 --- a/patches/collateral-evolutions/network/14-device-type/net_bluetooth_bnep_core.patch +++ b/patches/collateral-evolutions/network/14-device-type/net_bluetooth_bnep_core.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c -@@ -526,9 +526,11 @@ +@@ -526,9 +526,11 @@ static struct device *bnep_get_device(st return conn ? &conn->dev : NULL; } diff --git a/patches/collateral-evolutions/network/14-device-type/net_wireless_core.patch b/patches/collateral-evolutions/network/14-device-type/net_wireless_core.patch index 84eb5b26eb8e..dda66ab9cf7d 100644 --- a/patches/collateral-evolutions/network/14-device-type/net_wireless_core.patch +++ b/patches/collateral-evolutions/network/14-device-type/net_wireless_core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -839,9 +839,11 @@ +@@ -839,9 +839,11 @@ void cfg80211_unregister_wdev(struct wir } EXPORT_SYMBOL(cfg80211_unregister_wdev); diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch index 2ed169b03852..e8f890d27fd0 100644 --- a/patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch +++ b/patches/collateral-evolutions/network/15-symbol-export-conflicts/net_mac80211_rx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -3317,7 +3317,12 @@ +@@ -3317,7 +3317,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch b/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch index 5248d2d6844d..5d5fd922b54e 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c -@@ -297,8 +297,13 @@ +@@ -297,8 +297,13 @@ static int hci_uart_tty_open(struct tty_ /* FIXME: why is this needed. Note don't use ldisc_ref here as the open path is before the ldisc is referencable */ @@ -14,7 +14,7 @@ tty_driver_flush_buffer(tty); return 0; -@@ -524,7 +529,11 @@ +@@ -524,7 +529,11 @@ static int hci_uart_tty_ioctl(struct tty return hu->hdev_flags; default: diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch index 019bf5490a20..8607e2eadf63 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c -@@ -103,8 +103,12 @@ +@@ -103,8 +103,12 @@ void bt_sock_unregister(int proto) } EXPORT_SYMBOL(bt_sock_unregister); @@ -13,7 +13,7 @@ { int err; -@@ -122,7 +126,11 @@ +@@ -122,7 +126,11 @@ static int bt_sock_create(struct net *ne read_lock(&bt_proto_lock); if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { @@ -25,7 +25,7 @@ if (!err) bt_sock_reclassify_lock(sock->sk, proto); module_put(bt_proto[proto]->owner); -@@ -455,7 +463,11 @@ +@@ -455,7 +463,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch index 1b6a5cae7a2a..3e9c40fea9d1 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c -@@ -186,8 +186,12 @@ +@@ -186,8 +186,12 @@ static struct proto bnep_proto = { .obj_size = sizeof(struct bt_sock) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch index 25a51dcceb77..0b7a6e3dcf8e 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/cmtp/capi.c +++ b/net/bluetooth/cmtp/capi.c -@@ -384,7 +384,11 @@ +@@ -384,7 +384,11 @@ static void cmtp_reset_ctr(struct capi_c BT_DBG("ctrl %p", ctrl); diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch index d2ad25151e29..24b93553351b 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c -@@ -195,8 +195,12 @@ +@@ -195,8 +195,12 @@ static struct proto cmtp_proto = { .obj_size = sizeof(struct bt_sock) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch index 9f7a573ec482..923c718f7df2 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -884,8 +884,13 @@ +@@ -884,8 +884,13 @@ drop: goto done; } @@ -14,7 +14,7 @@ { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -1059,8 +1064,12 @@ +@@ -1059,8 +1064,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch index df664bdc8245..ac74a0e59d98 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c -@@ -72,7 +72,11 @@ +@@ -72,7 +72,11 @@ static struct attribute_group bt_link_gr .attrs = bt_link_attrs, }; @@ -12,7 +12,7 @@ &bt_link_group, NULL }; -@@ -141,7 +145,11 @@ +@@ -141,7 +145,11 @@ void hci_conn_del_sysfs(struct hci_conn dev = device_find_child(&conn->dev, NULL, __match_tty); if (!dev) break; @@ -24,7 +24,7 @@ put_device(dev); } -@@ -379,7 +387,11 @@ +@@ -379,7 +387,11 @@ static struct attribute_group bt_host_gr .attrs = bt_host_attrs, }; 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 8970690b8e2a..f5462670b50e 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 -@@ -383,6 +383,7 @@ +@@ -383,6 +383,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) { -@@ -441,6 +442,16 @@ +@@ -441,6 +442,16 @@ err: mutex_unlock(&session->report_mutex); return ret; } @@ -25,7 +25,7 @@ static void hidp_idle_timeout(unsigned long arg) { -@@ -743,8 +754,14 @@ +@@ -743,8 +754,14 @@ static int hidp_session(void *arg) } if (session->hid) { @@ -40,7 +40,7 @@ } /* Wakeup user-space polling for socket errors */ -@@ -855,6 +872,70 @@ +@@ -855,6 +872,70 @@ static void hidp_close(struct hid_device { } @@ -111,7 +111,7 @@ static int hidp_parse(struct hid_device *hid) { struct hidp_session *session = hid->driver_data; -@@ -946,7 +1027,9 @@ +@@ -946,7 +1027,9 @@ static int hidp_setup_hid(struct hidp_se hid->dev.parent = &session->conn->dev; hid->ll_driver = &hidp_hid_driver; @@ -121,7 +121,7 @@ hid->hid_output_raw_report = hidp_output_raw_report; /* True if device is blacklisted in drivers/hid/hid-core.c */ -@@ -964,6 +1047,7 @@ +@@ -964,6 +1047,7 @@ fault: return err; } @@ -129,7 +129,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock) { -@@ -979,6 +1063,39 @@ +@@ -979,6 +1063,39 @@ int hidp_add_connection(struct hidp_conn BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size); @@ -169,7 +169,7 @@ down_write(&hidp_session_sem); s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst); -@@ -1026,6 +1143,7 @@ +@@ -1026,6 +1143,7 @@ int hidp_add_connection(struct hidp_conn __hidp_link_session(session); @@ -177,7 +177,7 @@ if (req->rd_size > 0) { err = hidp_setup_hid(session, req); if (err && err != -ENODEV) -@@ -1037,6 +1155,16 @@ +@@ -1037,6 +1155,16 @@ int hidp_add_connection(struct hidp_conn if (err < 0) goto purge; } @@ -194,7 +194,7 @@ hidp_set_timer(session); -@@ -1095,6 +1223,7 @@ +@@ -1095,6 +1223,7 @@ unlink: session->input = NULL; } @@ -202,7 +202,7 @@ if (session->hid) { hid_destroy_device(session->hid); session->hid = NULL; -@@ -1108,10 +1237,15 @@ +@@ -1108,10 +1237,15 @@ purge: skb_queue_purge(&session->ctrl_transmit); skb_queue_purge(&session->intr_transmit); diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch index 9658f2b21884..b7bb65314a88 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c -@@ -235,8 +235,12 @@ +@@ -235,8 +235,12 @@ static struct proto hidp_proto = { .obj_size = sizeof(struct bt_sock) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch index 56e920be48a9..6a155d580e1e 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c -@@ -573,8 +573,13 @@ +@@ -573,8 +573,13 @@ static int l2cap_sock_setsockopt_old(str return err; } @@ -14,7 +14,7 @@ { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1225,8 +1230,12 @@ +@@ -1225,8 +1230,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -27,7 +27,7 @@ { struct sock *sk; -@@ -1238,7 +1247,11 @@ +@@ -1238,7 +1247,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch index 6aa1e8480d23..fbeb1073ad05 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c -@@ -304,8 +304,13 @@ +@@ -304,8 +304,13 @@ static struct sock *rfcomm_sock_alloc(st return sk; } @@ -14,7 +14,7 @@ { struct sock *sk; -@@ -660,7 +665,11 @@ +@@ -660,7 +665,11 @@ static int rfcomm_sock_setsockopt_old(st return err; } diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch index 957122ec3e88..7653c0ba62a2 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c -@@ -708,8 +708,12 @@ +@@ -708,8 +708,12 @@ static int rfcomm_tty_open(struct tty_st remove_wait_queue(&dev->wait, &wait); if (err == 0) @@ -13,7 +13,7 @@ rfcomm_tty_copy_pending(dev); -@@ -733,7 +737,11 @@ +@@ -733,7 +737,11 @@ static void rfcomm_tty_close(struct tty_ if (!--dev->port.count) { spin_unlock_irqrestore(&dev->port.lock, flags); if (dev->tty_dev->parent) @@ -25,7 +25,7 @@ /* Close DLC and dettach TTY */ rfcomm_dlc_close(dev->dlc, 0); -@@ -809,7 +817,11 @@ +@@ -809,7 +817,11 @@ static int rfcomm_tty_write_room(struct return room; } @@ -37,7 +37,7 @@ { BT_DBG("tty %p cmd 0x%02x", tty, cmd); -@@ -1068,7 +1080,11 @@ +@@ -1068,7 +1080,11 @@ static void rfcomm_tty_hangup(struct tty } } @@ -49,7 +49,7 @@ { struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; -@@ -1077,7 +1093,11 @@ +@@ -1077,7 +1093,11 @@ static int rfcomm_tty_tiocmget(struct tt return dev->modem_status; } diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch index 004869ae1d10..6b6d9a5d306d 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c -@@ -423,8 +423,12 @@ +@@ -423,8 +423,12 @@ static struct sock *sco_sock_alloc(struc return sk; } @@ -13,7 +13,7 @@ { struct sock *sk; -@@ -675,7 +679,11 @@ +@@ -675,7 +679,11 @@ static int sco_sock_recvmsg(struct kiocb return bt_sock_recvmsg(iocb, sock, msg, len, flags); } diff --git a/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch index 5c8f6976d38c..5f14b991890c 100644 --- a/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch +++ b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1643,6 +1643,7 @@ +@@ -1643,6 +1643,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. */ @@ -8,7 +8,7 @@ void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -1670,6 +1671,22 @@ +@@ -1670,6 +1671,22 @@ void ieee80211_remove_interfaces(struct kfree(sdata); } } diff --git a/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch b/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch index c733cc60c282..7bc09caa4f95 100644 --- a/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch +++ b/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch @@ -11,7 +11,7 @@ #include #include #include -@@ -522,6 +524,7 @@ +@@ -522,6 +524,7 @@ static char *cmtp_procinfo(struct capi_c return "CAPI Message Transport Protocol"; } @@ -19,7 +19,7 @@ static int cmtp_proc_show(struct seq_file *m, void *v) { struct capi_ctr *ctrl = m->private; -@@ -554,6 +557,36 @@ +@@ -554,6 +557,36 @@ static const struct file_operations cmtp .release = single_release, }; @@ -56,7 +56,7 @@ int cmtp_attach_device(struct cmtp_session *session) { unsigned char buf[4]; -@@ -592,7 +625,11 @@ +@@ -592,7 +625,11 @@ int cmtp_attach_device(struct cmtp_sessi session->ctrl.send_message = cmtp_send_message; session->ctrl.procinfo = cmtp_procinfo; diff --git a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch index 6495d2529ff6..a1f32e12f77d 100644 --- a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1512,6 +1512,10 @@ +@@ -1512,6 +1512,10 @@ void ieee80211_xmit(struct ieee80211_sub } } diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch index 23b80895660c..dcaa69c3d2fa 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bluecard_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c -@@ -158,7 +158,12 @@ +@@ -158,7 +158,12 @@ static void bluecard_detach(struct pcmci static void bluecard_activity_led_timeout(u_long arg) { bluecard_info_t *info = (bluecard_info_t *)arg; @@ -13,7 +13,7 @@ if (!test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) return; -@@ -175,7 +180,11 @@ +@@ -175,7 +180,11 @@ static void bluecard_activity_led_timeou static void bluecard_enable_activity_led(bluecard_info_t *info) { @@ -25,7 +25,7 @@ if (!test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) return; -@@ -231,7 +240,11 @@ +@@ -231,7 +240,11 @@ static void bluecard_write_wakeup(blueca } do { @@ -37,7 +37,7 @@ unsigned int offset; unsigned char command; unsigned long ready_bit; -@@ -378,7 +391,11 @@ +@@ -378,7 +391,11 @@ static void bluecard_receive(bluecard_in return; } @@ -49,7 +49,7 @@ if (test_bit(XMIT_SENDING_READY, &(info->tx_state))) bluecard_enable_activity_led(info); -@@ -507,7 +524,11 @@ +@@ -507,7 +524,11 @@ static irqreturn_t bluecard_interrupt(in if (!test_bit(CARD_READY, &(info->hw_state))) return IRQ_HANDLED; @@ -61,7 +61,7 @@ spin_lock(&(info->lock)); -@@ -629,7 +650,11 @@ +@@ -629,7 +650,11 @@ static int bluecard_hci_open(struct hci_ return 0; if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) { @@ -73,7 +73,7 @@ /* Enable LED */ outb(0x08 | 0x20, iobase + 0x30); -@@ -649,7 +674,11 @@ +@@ -649,7 +674,11 @@ static int bluecard_hci_close(struct hci bluecard_hci_flush(hdev); if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) { @@ -85,7 +85,7 @@ /* Disable LED */ outb(0x00, iobase + 0x30); -@@ -705,7 +734,11 @@ +@@ -705,7 +734,11 @@ static int bluecard_hci_ioctl(struct hci static int bluecard_open(bluecard_info_t *info) { @@ -97,7 +97,7 @@ struct hci_dev *hdev; unsigned char id; -@@ -821,7 +854,11 @@ +@@ -821,7 +854,11 @@ static int bluecard_open(bluecard_info_t static int bluecard_close(bluecard_info_t *info) { @@ -109,7 +109,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -856,7 +893,18 @@ +@@ -856,7 +893,18 @@ static int bluecard_probe(struct pcmcia_ info->p_dev = link; link->priv = info; @@ -128,7 +128,7 @@ return bluecard_config(link); } -@@ -873,15 +921,30 @@ +@@ -873,15 +921,30 @@ static int bluecard_config(struct pcmcia bluecard_info_t *info = link->priv; int i, n; @@ -159,7 +159,7 @@ if (i == 0) break; } -@@ -889,9 +952,15 @@ +@@ -889,9 +952,15 @@ static int bluecard_config(struct pcmcia if (i != 0) goto failed; @@ -175,7 +175,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -929,7 +998,13 @@ +@@ -929,7 +998,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids static struct pcmcia_driver bluecard_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch index ac7ef633dff1..6a8aa8eb5e7e 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_bt3c_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c -@@ -186,7 +186,11 @@ +@@ -186,7 +186,11 @@ static void bt3c_write_wakeup(bt3c_info_ return; do { @@ -12,7 +12,7 @@ register struct sk_buff *skb; int len; -@@ -224,7 +228,11 @@ +@@ -224,7 +228,11 @@ static void bt3c_receive(bt3c_info_t *in return; } @@ -24,7 +24,7 @@ avail = bt3c_read(iobase, 0x7006); //printk("bt3c_cs: receiving %d bytes\n", avail); -@@ -345,7 +353,11 @@ +@@ -345,7 +353,11 @@ static irqreturn_t bt3c_interrupt(int ir /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -473,7 +485,11 @@ +@@ -473,7 +485,11 @@ static int bt3c_load_firmware(bt3c_info_ unsigned int iobase, size, addr, fcs, tmp; int i, err = 0; @@ -48,7 +48,7 @@ /* Reset */ bt3c_io_write(iobase, 0x8040, 0x0404); -@@ -645,8 +661,27 @@ +@@ -645,8 +661,27 @@ static int bt3c_probe(struct pcmcia_devi info->p_dev = link; link->priv = info; @@ -76,7 +76,7 @@ return bt3c_config(link); } -@@ -657,6 +692,7 @@ +@@ -657,6 +692,7 @@ static void bt3c_detach(struct pcmcia_de bt3c_release(link); } @@ -84,7 +84,7 @@ static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data) { int *try = priv_data; -@@ -695,6 +731,63 @@ +@@ -695,6 +731,63 @@ static int bt3c_check_config_notpicky(st } return -ENODEV; } @@ -148,7 +148,7 @@ static int bt3c_config(struct pcmcia_device *link) { -@@ -718,9 +811,15 @@ +@@ -718,9 +811,15 @@ static int bt3c_config(struct pcmcia_dev goto failed; found_port: @@ -164,7 +164,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -755,7 +854,13 @@ +@@ -755,7 +854,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids); static struct pcmcia_driver bt3c_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch index 56b25bd702d3..d35eaad28d69 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_btuart_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c -@@ -140,7 +140,11 @@ +@@ -140,7 +140,11 @@ static void btuart_write_wakeup(btuart_i } do { @@ -12,7 +12,7 @@ register struct sk_buff *skb; int len; -@@ -181,7 +185,11 @@ +@@ -181,7 +185,11 @@ static void btuart_receive(btuart_info_t return; } @@ -24,7 +24,7 @@ do { info->hdev->stat.byte_rx++; -@@ -295,7 +303,11 @@ +@@ -295,7 +303,11 @@ static irqreturn_t btuart_interrupt(int /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -352,7 +364,11 @@ +@@ -352,7 +364,11 @@ static void btuart_change_speed(btuart_i return; } @@ -48,7 +48,7 @@ spin_lock_irqsave(&(info->lock), flags); -@@ -471,7 +487,11 @@ +@@ -471,7 +487,11 @@ static int btuart_hci_ioctl(struct hci_d static int btuart_open(btuart_info_t *info) { unsigned long flags; @@ -60,7 +60,7 @@ struct hci_dev *hdev; spin_lock_init(&(info->lock)); -@@ -538,7 +558,11 @@ +@@ -538,7 +558,11 @@ static int btuart_open(btuart_info_t *in static int btuart_close(btuart_info_t *info) { unsigned long flags; @@ -72,7 +72,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -574,8 +598,27 @@ +@@ -574,8 +598,27 @@ static int btuart_probe(struct pcmcia_de info->p_dev = link; link->priv = info; @@ -100,7 +100,7 @@ return btuart_config(link); } -@@ -586,6 +629,7 @@ +@@ -586,6 +629,7 @@ static void btuart_detach(struct pcmcia_ btuart_release(link); } @@ -108,7 +108,7 @@ static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) { int *try = priv_data; -@@ -624,6 +668,63 @@ +@@ -624,6 +668,63 @@ static int btuart_check_config_notpicky( } return -ENODEV; } @@ -172,7 +172,7 @@ static int btuart_config(struct pcmcia_device *link) { -@@ -647,9 +748,15 @@ +@@ -647,9 +748,15 @@ static int btuart_config(struct pcmcia_d goto failed; found_port: @@ -188,7 +188,7 @@ i = pcmcia_enable_device(link); if (i != 0) -@@ -683,7 +790,13 @@ +@@ -683,7 +790,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids); static struct pcmcia_driver btuart_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch index 26e06b9b8da8..1c14c79b16a1 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_bluetooth_dtl1_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c -@@ -144,7 +144,11 @@ +@@ -144,7 +144,11 @@ static void dtl1_write_wakeup(dtl1_info_ } do { @@ -12,7 +12,7 @@ register struct sk_buff *skb; int len; -@@ -209,7 +213,11 @@ +@@ -209,7 +213,11 @@ static void dtl1_receive(dtl1_info_t *in return; } @@ -24,7 +24,7 @@ do { info->hdev->stat.byte_rx++; -@@ -296,7 +304,11 @@ +@@ -296,7 +304,11 @@ static irqreturn_t dtl1_interrupt(int ir /* our irq handler is shared */ return IRQ_NONE; @@ -36,7 +36,7 @@ spin_lock(&(info->lock)); -@@ -451,7 +463,11 @@ +@@ -451,7 +463,11 @@ static int dtl1_hci_ioctl(struct hci_dev static int dtl1_open(dtl1_info_t *info) { unsigned long flags; @@ -48,7 +48,7 @@ struct hci_dev *hdev; spin_lock_init(&(info->lock)); -@@ -495,8 +511,13 @@ +@@ -495,8 +511,13 @@ static int dtl1_open(dtl1_info_t *info) outb(UART_LCR_WLEN8, iobase + UART_LCR); /* Reset DLAB */ outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase + UART_MCR); @@ -62,7 +62,7 @@ /* Turn on interrupts */ outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER); -@@ -521,7 +542,11 @@ +@@ -521,7 +542,11 @@ static int dtl1_open(dtl1_info_t *info) static int dtl1_close(dtl1_info_t *info) { unsigned long flags; @@ -74,7 +74,7 @@ struct hci_dev *hdev = info->hdev; if (!hdev) -@@ -557,7 +582,24 @@ +@@ -557,7 +582,24 @@ static int dtl1_probe(struct pcmcia_devi info->p_dev = link; link->priv = info; @@ -99,7 +99,7 @@ return dtl1_config(link); } -@@ -571,6 +613,7 @@ +@@ -571,6 +613,7 @@ static void dtl1_detach(struct pcmcia_de pcmcia_disable_device(link); } @@ -107,7 +107,7 @@ static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data) { if ((p_dev->resource[1]->end) || (p_dev->resource[1]->end < 8)) -@@ -581,6 +624,29 @@ +@@ -581,6 +624,29 @@ static int dtl1_confcheck(struct pcmcia_ return pcmcia_request_io(p_dev); } @@ -137,7 +137,7 @@ static int dtl1_config(struct pcmcia_device *link) { -@@ -588,14 +654,24 @@ +@@ -588,14 +654,24 @@ static int dtl1_config(struct pcmcia_dev int ret; /* Look for a generic full-sized window */ @@ -162,7 +162,7 @@ ret = pcmcia_enable_device(link); if (ret) -@@ -623,7 +699,13 @@ +@@ -623,7 +699,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); static struct pcmcia_driver dtl1_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_b43_pcmcia.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_b43_pcmcia.patch index dc1b3c665d1f..201cfeaa31d7 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_b43_pcmcia.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_b43_pcmcia.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c -@@ -63,6 +63,9 @@ +@@ -63,6 +63,9 @@ static int b43_pcmcia_resume(struct pcmc static int b43_pcmcia_probe(struct pcmcia_device *dev) { struct ssb_bus *ssb; @@ -10,7 +10,7 @@ int err = -ENOMEM; int res = 0; -@@ -72,6 +75,7 @@ +@@ -72,6 +75,7 @@ static int b43_pcmcia_probe(struct pcmci err = -ENODEV; @@ -18,7 +18,7 @@ dev->config_flags |= CONF_ENABLE_IRQ; dev->resource[2]->flags |= WIN_ENABLE | WIN_DATA_WIDTH_16 | -@@ -79,21 +83,46 @@ +@@ -79,21 +83,46 @@ static int b43_pcmcia_probe(struct pcmci dev->resource[2]->start = 0; dev->resource[2]->end = SSB_CORE_SIZE; res = pcmcia_request_window(dev, dev->resource[2], 250); @@ -66,7 +66,7 @@ if (err) goto err_disable; dev->priv = ssb; -@@ -122,7 +151,13 @@ +@@ -122,7 +151,13 @@ static void b43_pcmcia_remove(struct pcm static struct pcmcia_driver b43_pcmcia_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch index 2568ba6e1cf1..f800280ccfa1 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_libertas_if_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c -@@ -757,7 +757,11 @@ +@@ -757,7 +757,11 @@ static void if_cs_prog_firmware(struct l goto out; /* Now actually get the IRQ */ @@ -12,7 +12,7 @@ IRQF_SHARED, DRV_NAME, card); if (ret) { pr_err("error in request_irq\n"); -@@ -775,7 +779,11 @@ +@@ -775,7 +779,11 @@ static void if_cs_prog_firmware(struct l priv->fw_ready = 1; if (lbs_start_card(priv) != 0) { pr_err("could not activate card\n"); @@ -24,7 +24,7 @@ } out: -@@ -824,7 +832,11 @@ +@@ -824,7 +832,11 @@ static void if_cs_release(struct pcmcia_ lbs_deb_enter(LBS_DEB_CS); @@ -36,7 +36,7 @@ pcmcia_disable_device(p_dev); if (card->iobase) ioport_unmap(card->iobase); -@@ -832,7 +844,7 @@ +@@ -832,7 +844,7 @@ static void if_cs_release(struct pcmcia_ lbs_deb_leave(LBS_DEB_CS); } @@ -45,7 +45,7 @@ static int if_cs_ioprobe(struct pcmcia_device *p_dev, void *priv_data) { p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; -@@ -842,9 +854,39 @@ +@@ -842,9 +854,39 @@ static int if_cs_ioprobe(struct pcmcia_d pr_err("wrong CIS (check number of IO windows)\n"); return -ENODEV; } @@ -85,7 +85,7 @@ } static int if_cs_probe(struct pcmcia_device *p_dev) -@@ -863,7 +905,16 @@ +@@ -863,7 +905,16 @@ static int if_cs_probe(struct pcmcia_dev card->p_dev = p_dev; p_dev->priv = card; @@ -102,7 +102,7 @@ if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) { pr_err("error in pcmcia_loop_config\n"); -@@ -875,12 +926,26 @@ +@@ -875,12 +926,26 @@ static int if_cs_probe(struct pcmcia_dev * a handler to the interrupt, unless the 'Handler' member of * the irq structure is initialized. */ @@ -129,7 +129,7 @@ if (!card->iobase) { pr_err("error in ioport_map\n"); ret = -EIO; -@@ -894,7 +959,17 @@ +@@ -894,7 +959,17 @@ static int if_cs_probe(struct pcmcia_dev } /* Finally, report what we've done */ @@ -147,7 +147,7 @@ /* * Most of the libertas cards can do unaligned register access, but some -@@ -1001,7 +1076,13 @@ +@@ -1001,7 +1076,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids); static struct pcmcia_driver lbs_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_orinoco_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_orinoco_cs.patch index ef86ab3ec27a..fcd179a75bbb 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_orinoco_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_orinoco_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c -@@ -78,7 +78,11 @@ +@@ -78,7 +78,11 @@ orinoco_cs_hard_reset(struct orinoco_pri /* We need atomic ops here, because we're not holding the lock */ set_bit(0, &card->hard_reset_in_progress); @@ -12,7 +12,7 @@ if (err) return err; -@@ -108,6 +112,16 @@ +@@ -108,6 +112,16 @@ orinoco_cs_probe(struct pcmcia_device *l card->p_dev = link; link->priv = priv; @@ -29,7 +29,7 @@ return orinoco_cs_config(link); } /* orinoco_cs_attach */ -@@ -122,6 +136,7 @@ +@@ -122,6 +136,7 @@ static void orinoco_cs_detach(struct pcm free_orinocodev(priv); } /* orinoco_cs_detach */ @@ -37,7 +37,7 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev, void *priv_data) { if (p_dev->config_index == 0) -@@ -129,6 +144,98 @@ +@@ -129,6 +144,98 @@ static int orinoco_cs_config_check(struc return pcmcia_request_io(p_dev); }; @@ -136,7 +136,7 @@ static int orinoco_cs_config(struct pcmcia_device *link) -@@ -138,10 +245,12 @@ +@@ -138,10 +245,12 @@ orinoco_cs_config(struct pcmcia_device * int ret; void __iomem *mem; @@ -149,7 +149,7 @@ ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL); if (ret) { if (!ignore_cis_vcc) -@@ -151,8 +260,12 @@ +@@ -151,8 +260,12 @@ orinoco_cs_config(struct pcmcia_device * goto failed; } @@ -162,7 +162,7 @@ if (!mem) goto failed; -@@ -161,7 +274,11 @@ +@@ -161,7 +274,11 @@ orinoco_cs_config(struct pcmcia_device * * called. */ hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); @@ -174,7 +174,7 @@ if (ret) goto failed; -@@ -176,8 +293,16 @@ +@@ -176,8 +293,16 @@ orinoco_cs_config(struct pcmcia_device * } /* Register an interface with the stack */ @@ -191,7 +191,7 @@ printk(KERN_ERR PFX "orinoco_if_add() failed\n"); goto failed; } -@@ -331,7 +456,13 @@ +@@ -331,7 +456,13 @@ MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_i static struct pcmcia_driver orinoco_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch index d92d0cfa3c1c..2941af936255 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c -@@ -170,6 +170,16 @@ +@@ -170,6 +170,16 @@ spectrum_cs_probe(struct pcmcia_device * card->p_dev = link; link->priv = priv; @@ -17,7 +17,7 @@ return spectrum_cs_config(link); } /* spectrum_cs_attach */ -@@ -184,6 +194,7 @@ +@@ -184,6 +194,7 @@ static void spectrum_cs_detach(struct pc free_orinocodev(priv); } /* spectrum_cs_detach */ @@ -25,7 +25,7 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev, void *priv_data) { -@@ -192,6 +203,98 @@ +@@ -192,6 +203,98 @@ static int spectrum_cs_config_check(stru return pcmcia_request_io(p_dev); }; @@ -124,7 +124,7 @@ static int spectrum_cs_config(struct pcmcia_device *link) -@@ -201,10 +304,12 @@ +@@ -201,10 +304,12 @@ spectrum_cs_config(struct pcmcia_device int ret; void __iomem *mem; @@ -137,7 +137,7 @@ ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL); if (ret) { if (!ignore_cis_vcc) -@@ -214,8 +319,12 @@ +@@ -214,8 +319,12 @@ spectrum_cs_config(struct pcmcia_device goto failed; } @@ -150,7 +150,7 @@ if (!mem) goto failed; -@@ -225,7 +334,11 @@ +@@ -225,7 +334,11 @@ spectrum_cs_config(struct pcmcia_device hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); hw->eeprom_pda = true; @@ -162,7 +162,7 @@ if (ret) goto failed; -@@ -244,8 +357,16 @@ +@@ -244,8 +357,16 @@ spectrum_cs_config(struct pcmcia_device } /* Register an interface with the stack */ @@ -179,7 +179,7 @@ printk(KERN_ERR PFX "orinoco_if_add() failed\n"); goto failed; } -@@ -311,7 +432,13 @@ +@@ -311,7 +432,13 @@ MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ static struct pcmcia_driver orinoco_driver = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_ssb_main.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_ssb_main.patch index 7223ace2ba5a..4c08c4e1590a 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_ssb_main.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_ssb_main.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -517,7 +517,11 @@ +@@ -517,7 +517,11 @@ static int ssb_devices_register(struct s break; case SSB_BUSTYPE_PCMCIA: #ifdef CONFIG_SSB_PCMCIAHOST diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch index 84961af695b1..5f18a4ac9308 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/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 -@@ -410,7 +410,11 @@ +@@ -410,7 +410,11 @@ static void atl1c_set_multi(struct net_d /* comoute mc addresses' hash value ,and put it into hash table */ netdev_for_each_mc_addr(ha, netdev) { diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch index 830f8c70d1a0..0da229f56031 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -308,7 +308,11 @@ +@@ -308,7 +308,11 @@ static void atl1e_set_multi(struct net_d /* comoute mc addresses' hash value ,and put it into hash table */ netdev_for_each_mc_addr(ha, netdev) { diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atl2.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atl2.patch index 3567501f41f6..815d3ca949d8 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atl2.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atl2.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c -@@ -159,7 +159,11 @@ +@@ -159,7 +159,11 @@ static void atl2_set_multi(struct net_de /* comoute mc addresses' hash value ,and put it into hash table */ netdev_for_each_mc_addr(ha, netdev) { diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atlx.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atlx.patch index c41d4c3aa1f4..76e924dc8306 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atlx.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_atheros_atlx_atlx.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c -@@ -149,7 +149,11 @@ +@@ -149,7 +149,11 @@ static void atlx_set_multi(struct net_de /* compute mc addresses' hash value ,and put it into hash table */ netdev_for_each_mc_addr(ha, netdev) { diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_broadcom_b44.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_broadcom_b44.patch index ad9fde3e2c40..2e129089d7b9 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_broadcom_b44.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_ethernet_broadcom_b44.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c -@@ -1693,7 +1693,11 @@ +@@ -1693,7 +1693,11 @@ static int __b44_load_mcast(struct b44 * netdev_for_each_mc_addr(ha, dev) { if (i == num_ents) break; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_adm8211.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_adm8211.patch index 1dd519e2ffb9..049512c30346 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_adm8211.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_adm8211.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c -@@ -1320,19 +1320,37 @@ +@@ -1320,19 +1320,37 @@ static void adm8211_bss_info_changed(str } static u64 adm8211_prepare_multicast(struct ieee80211_hw *hw, diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath5k_mac80211-ops.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath5k_mac80211-ops.patch index b9d8ba453c1d..485ab8bdb942 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath5k_mac80211-ops.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath5k_mac80211-ops.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c -@@ -318,20 +318,42 @@ +@@ -318,20 +318,42 @@ ath5k_bss_info_changed(struct ieee80211_ static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -43,7 +43,7 @@ pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); -@@ -340,6 +362,9 @@ +@@ -340,6 +362,9 @@ ath5k_prepare_multicast(struct ieee80211 * need to inform below not to reset the mcast */ /* ath5k_hw_set_mcast_filterindex(ah, * ha->addr[5]); */ diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath6kl_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath6kl_main.patch index 6923fea12433..fecfbaba1712 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath6kl_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_ath6kl_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c -@@ -1205,7 +1205,11 @@ +@@ -1205,7 +1205,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) { @@ -12,7 +12,7 @@ ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) { found = true; break; -@@ -1239,7 +1243,11 @@ +@@ -1239,7 +1243,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) { @@ -24,7 +24,7 @@ ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) { found = true; break; -@@ -1254,7 +1262,11 @@ +@@ -1254,7 +1262,11 @@ static void ath6kl_set_multicast_list(st goto out; } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_carl9170_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_carl9170_main.patch index 0b850d7157b3..57a303b5a588 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_carl9170_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ath_carl9170_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c -@@ -967,17 +967,35 @@ +@@ -967,17 +967,35 @@ out: return err; } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_brcm80211_brcmfmac_dhd_linux.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_brcm80211_brcmfmac_dhd_linux.patch index a6ca11158a44..57e4cc441d88 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_brcm80211_brcmfmac_dhd_linux.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_brcm80211_brcmfmac_dhd_linux.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c -@@ -103,7 +103,11 @@ +@@ -103,7 +103,11 @@ static void _brcmf_set_multicast_list(st netdev_for_each_mc_addr(ha, ndev) { if (!cnt) break; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_main.patch index 8aa9d171280f..a7a9bbc6f42b 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -349,18 +349,34 @@ +@@ -349,18 +349,34 @@ static int lbs_add_mcast_addrs(struct cm netif_addr_lock_bh(dev); cnt = netdev_mc_count(dev); netdev_for_each_mc_addr(ha, dev) { diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_tf_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_tf_main.patch index f681b71b184b..f3536d4484a9 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_tf_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_libertas_tf_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c -@@ -421,20 +421,36 @@ +@@ -421,20 +421,36 @@ static int lbtf_op_config(struct ieee802 } static u64 lbtf_op_prepare_multicast(struct ieee80211_hw *hw, diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch index e5ed0b93fdce..0dca0d210464 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_debugfs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/debugfs.c +++ b/drivers/net/wireless/mwifiex/debugfs.c -@@ -215,7 +215,11 @@ +@@ -215,7 +215,11 @@ mwifiex_info_read(struct file *file, cha netdev_for_each_mc_addr(ha, netdev) p += sprintf(p, "multicast_address[%d]=\"%pM\"\n", diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_sta_ioctl.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_sta_ioctl.patch index fb9ca756719b..a0741df1e3b5 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_sta_ioctl.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwifiex_sta_ioctl.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/drivers/net/wireless/mwifiex/sta_ioctl.c -@@ -43,7 +43,11 @@ +@@ -43,7 +43,11 @@ int mwifiex_copy_mcast_addr(struct mwifi struct netdev_hw_addr *ha; netdev_for_each_mc_addr(ha, dev) diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch index ab703c63a7c3..dbeffcc8254c 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c -@@ -2656,15 +2656,21 @@ +@@ -2656,15 +2656,21 @@ struct mwl8k_cmd_mac_multicast_adr { static struct mwl8k_cmd_pkt * __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, @@ -22,7 +22,7 @@ if (allmulti || mc_count > priv->num_mcaddrs) { allmulti = 1; -@@ -2685,13 +2691,27 @@ +@@ -2685,13 +2691,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee if (allmulti) { cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); } else if (mc_count) { @@ -50,7 +50,7 @@ } } -@@ -5022,7 +5042,11 @@ +@@ -5022,7 +5042,11 @@ mwl8k_bss_info_changed(struct ieee80211_ } static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, @@ -62,7 +62,7 @@ { struct mwl8k_cmd_pkt *cmd; -@@ -5033,7 +5057,11 @@ +@@ -5033,7 +5057,11 @@ static u64 mwl8k_prepare_multicast(struc * we'll end up throwing this packet away and creating a new * one in mwl8k_configure_filter(). */ @@ -74,7 +74,7 @@ return (unsigned long)cmd; } -@@ -5155,7 +5183,11 @@ +@@ -5155,7 +5183,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch index 7b266daa6a63..92d2e4c211c7 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_orinoco_hw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/hw.c +++ b/drivers/net/wireless/orinoco/hw.c -@@ -1093,7 +1093,11 @@ +@@ -1093,7 +1093,11 @@ int __orinoco_hw_set_multicast_list(stru netdev_for_each_mc_addr(ha, dev) { if (i == mc_count) break; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_p54_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_p54_main.patch index 7c12eefb0052..e2883c5e313f 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_p54_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_p54_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c -@@ -364,11 +364,18 @@ +@@ -364,11 +364,18 @@ out: return ret; } @@ -19,7 +19,7 @@ int i; BUILD_BUG_ON(ARRAY_SIZE(priv->mc_maclist) != -@@ -378,12 +385,23 @@ +@@ -378,12 +385,23 @@ static u64 p54_prepare_multicast(struct * Otherwise the firmware will drop it and ARP will no longer work. */ i = 1; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rndis_wlan.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rndis_wlan.patch index bac06a411e1d..31fc596f6cb0 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rndis_wlan.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rndis_wlan.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -1629,7 +1629,11 @@ +@@ -1629,7 +1629,11 @@ static void set_multicast_list(struct us netdev_for_each_mc_addr(ha, usbdev->net) memcpy(mc_addrs + i++ * ETH_ALEN, diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8180_dev.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8180_dev.patch index 499eb6205331..f25881fa6f63 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8180_dev.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8180_dev.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c -@@ -818,10 +818,19 @@ +@@ -818,10 +818,19 @@ static void rtl8180_bss_info_changed(str } } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch index 536744cc6c2d..071d0be59cd8 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_rtl818x_rtl8187_dev.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c -@@ -1290,9 +1290,17 @@ +@@ -1290,9 +1290,17 @@ static void rtl8187_bss_info_changed(str } static u64 rtl8187_prepare_multicast(struct ieee80211_hw *dev, diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch index 0cb7c4b87bcf..38c2b1aa3150 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -2952,11 +2952,20 @@ +@@ -2952,11 +2952,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -21,7 +21,7 @@ fp = kzalloc(sizeof(*fp), GFP_ATOMIC); if (!fp) { -@@ -2965,16 +2974,40 @@ +@@ -2965,16 +2974,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch index 8223b7e5f09c..27338cd9dac7 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c -@@ -1215,17 +1215,34 @@ +@@ -1215,17 +1215,34 @@ static void zd_process_intr(struct work_ static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw, diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h index 634e5edf1e35..e1a1597acdba 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h +++ b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.h @@ -1,6 +1,6 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2604,14 +2604,24 @@ +@@ -2604,14 +2604,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/25-multicast-list_head/net_bluetooth_bnep_netdev.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_bluetooth_bnep_netdev.patch index aca6602c07f2..3d44951bbc48 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_bluetooth_bnep_netdev.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_bluetooth_bnep_netdev.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c -@@ -93,8 +93,13 @@ +@@ -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; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h index 657d9ba8f333..97dff3f74377 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.h @@ -1,6 +1,6 @@ --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h -@@ -227,20 +227,35 @@ +@@ -227,20 +227,35 @@ static inline void drv_bss_info_changed( } static inline u64 drv_prepare_multicast(struct ieee80211_local *local, @@ -36,7 +36,7 @@ static inline void drv_set_multicast_list(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, struct netdev_hw_addr_list *mc_list) -@@ -256,6 +271,23 @@ +@@ -256,6 +271,23 @@ static inline void drv_set_multicast_lis allmulti, mc_list); trace_drv_return_void(local); } diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h index e897989179f2..629007d17c3c 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -907,7 +907,12 @@ +@@ -907,7 +907,12 @@ struct ieee80211_local { struct work_struct reconfig_filter; /* aggregated multicast list */ diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch index fc9924766199..5e0bf21487fd 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -743,8 +743,13 @@ +@@ -743,8 +743,13 @@ static void ieee80211_do_stop(struct iee if (sdata->dev) { netif_addr_lock_bh(sdata->dev); spin_lock_bh(&local->filter_lock); @@ -14,7 +14,7 @@ spin_unlock_bh(&local->filter_lock); netif_addr_unlock_bh(sdata->dev); -@@ -927,10 +932,20 @@ +@@ -927,10 +932,20 @@ static void ieee80211_set_multicast_list if (sdata->vif.type != NL80211_IFTYPE_MONITOR && sdata->vif.type != NL80211_IFTYPE_AP_VLAN && sdata->vif.type != NL80211_IFTYPE_AP) diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch index 03c405b88270..0cbdac5968af 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -71,7 +71,11 @@ +@@ -71,7 +71,11 @@ void ieee80211_configure_filter(struct i spin_lock_bh(&local->filter_lock); changed_flags = local->filter_flags ^ new_flags; @@ -12,7 +12,7 @@ spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -592,9 +596,11 @@ +@@ -592,9 +596,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( wiphy->vht_capa_mod_mask = &mac80211_vht_capa_mod_mask; INIT_LIST_HEAD(&local->interfaces); diff --git a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_libertas_if_sdio.patch b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_libertas_if_sdio.patch index 7f8485965f1a..ada7689a91bd 100644 --- a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_libertas_if_sdio.patch +++ b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_libertas_if_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -877,6 +877,7 @@ +@@ -877,6 +877,7 @@ static int if_sdio_power_on(struct if_sd if (ret) goto release; @@ -8,7 +8,7 @@ /* 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. */ -@@ -895,6 +896,7 @@ +@@ -895,6 +896,7 @@ static int if_sdio_power_on(struct if_sd if (ret) goto disable; } diff --git a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch index 3f8fcf705a8d..07cf4b03ee33 100644 --- a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch +++ b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -75,7 +75,9 @@ +@@ -75,7 +75,9 @@ mwifiex_sdio_probe(struct sdio_func *fun card->func = func; diff --git a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_fw.patch b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_fw.patch index cd0b9be0219f..371edb2c4d85 100644 --- a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_fw.patch +++ b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_fw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/fw.c +++ b/drivers/net/wireless/orinoco/fw.c -@@ -123,7 +123,7 @@ +@@ -123,7 +123,7 @@ orinoco_dl_firmware(struct orinoco_priva dev_dbg(dev, "Attempting to download firmware %s\n", firmware); /* Read current plug data */ @@ -9,7 +9,7 @@ dev_dbg(dev, "Read PDA returned %d\n", err); if (err) goto free; -@@ -225,7 +225,7 @@ +@@ -225,7 +225,7 @@ symbol_dl_image(struct orinoco_private * if (!pda) return -ENOMEM; diff --git a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h index 7ae3f0cb33a9..f4dc9464a6e5 100644 --- a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h +++ b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.h @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/hermes.h +++ b/drivers/net/wireless/orinoco/hermes.h -@@ -393,7 +393,7 @@ +@@ -393,7 +393,7 @@ struct hermes_ops { u16 id, u16 offset); int (*bap_pwrite)(struct hermes *hw, int bap, const void *buf, int len, u16 id, u16 offset); diff --git a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch index e2f4b6874670..eb293fec7a2d 100644 --- a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch +++ b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_hermes.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/hermes.c +++ b/drivers/net/wireless/orinoco/hermes.c -@@ -767,7 +767,7 @@ +@@ -767,7 +767,7 @@ static const struct hermes_ops hermes_op .write_ltv = hermes_write_ltv, .bap_pread = hermes_bap_pread, .bap_pwrite = hermes_bap_pwrite, diff --git a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_orinoco_usb.patch b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_orinoco_usb.patch index 29c72445f1b5..aa08ba8af1e2 100644 --- a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_orinoco_usb.patch +++ b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict/drivers_net_wireless_orinoco_orinoco_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c -@@ -1553,7 +1553,7 @@ +@@ -1553,7 +1553,7 @@ static const struct hermes_ops ezusb_ops .read_ltv = ezusb_read_ltv, .write_ltv = ezusb_write_ltv, .bap_pread = ezusb_bap_pread, diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch index 77f3dac029d2..ed6f80a4aff2 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c -@@ -1050,6 +1050,7 @@ +@@ -1050,6 +1050,7 @@ static void btmrvl_sdio_remove(struct sd } } @@ -8,7 +8,7 @@ static int btmrvl_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1145,6 +1146,7 @@ +@@ -1145,6 +1146,7 @@ static const struct dev_pm_ops btmrvl_sd .suspend = btmrvl_sdio_suspend, .resume = btmrvl_sdio_resume, }; @@ -16,7 +16,7 @@ static struct sdio_driver bt_mrvl_sdio = { .name = "btmrvl_sdio", -@@ -1153,7 +1155,9 @@ +@@ -1153,7 +1155,9 @@ static struct sdio_driver bt_mrvl_sdio = .remove = btmrvl_sdio_remove, .drv = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_ath_ath6kl_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_ath_ath6kl_sdio.patch index c67f2309bd29..71bf82a7ee59 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_ath_ath6kl_sdio.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_ath_ath6kl_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c -@@ -817,6 +817,7 @@ +@@ -817,6 +817,7 @@ out: return ret; } @@ -8,7 +8,7 @@ static int ath6kl_set_sdio_pm_caps(struct ath6kl *ar) { struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar); -@@ -950,6 +951,17 @@ +@@ -950,6 +951,17 @@ static int ath6kl_sdio_resume(struct ath return 0; } @@ -26,7 +26,7 @@ /* set the window address register (using 4-byte register access ). */ static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr) -@@ -1263,7 +1275,7 @@ +@@ -1263,7 +1275,7 @@ static const struct ath6kl_hif_ops ath6k .stop = ath6kl_sdio_stop, }; @@ -35,7 +35,7 @@ /* * Empty handlers so that mmc subsystem doesn't remove us entirely during -@@ -1413,7 +1425,9 @@ +@@ -1413,7 +1425,9 @@ static struct sdio_driver ath6kl_sdio_dr .id_table = ath6kl_sdio_devices, .probe = ath6kl_sdio_probe, .remove = ath6kl_sdio_remove, diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch index d76c3c855750..310dee213a41 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c -@@ -71,7 +71,7 @@ +@@ -71,7 +71,7 @@ static bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) { bool is_err = false; @@ -9,7 +9,7 @@ is_err = atomic_read(&sdiodev->suspend); #endif return is_err; -@@ -80,7 +80,7 @@ +@@ -80,7 +80,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ static void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq) { @@ -18,7 +18,7 @@ int retry = 0; while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); -@@ -546,7 +546,7 @@ +@@ -546,7 +546,7 @@ static void brcmf_ops_sdio_remove(struct brcmf_dbg(TRACE, "Exit\n"); } @@ -27,7 +27,7 @@ static int brcmf_sdio_suspend(struct device *dev) { mmc_pm_flag_t sdio_flags; -@@ -596,7 +596,7 @@ +@@ -596,7 +596,7 @@ static struct sdio_driver brcmf_sdmmc_dr .remove = brcmf_ops_sdio_remove, .name = "brcmfmac", .id_table = brcmf_sdmmc_ids, diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_libertas_if_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_libertas_if_sdio.patch index 3ee28d7c2248..e5d4fafbe20b 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_libertas_if_sdio.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_libertas_if_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -1345,6 +1345,7 @@ +@@ -1345,6 +1345,7 @@ static void if_sdio_remove(struct sdio_f lbs_deb_leave(LBS_DEB_SDIO); } @@ -8,7 +8,7 @@ static int if_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1403,15 +1404,18 @@ +@@ -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/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch index 14297c483920..9ceddc4177d6 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -129,8 +129,10 @@ +@@ -129,8 +129,10 @@ mwifiex_sdio_remove(struct sdio_func *fu wait_for_completion(&adapter->fw_load); if (user_rmmod) { @@ -11,7 +11,7 @@ for (i = 0; i < adapter->priv_num; i++) if ((GET_BSS_ROLE(adapter->priv[i]) == -@@ -147,6 +149,7 @@ +@@ -147,6 +149,7 @@ mwifiex_sdio_remove(struct sdio_func *fu kfree(card); } @@ -19,7 +19,7 @@ /* * SDIO suspend. * -@@ -246,6 +249,7 @@ +@@ -246,6 +249,7 @@ static int mwifiex_sdio_resume(struct de return 0; } @@ -27,7 +27,7 @@ /* Device ID for SD8786 */ #define SDIO_DEVICE_ID_MARVELL_8786 (0x9116) -@@ -264,10 +268,12 @@ +@@ -264,10 +268,12 @@ static const struct sdio_device_id mwifi MODULE_DEVICE_TABLE(sdio, mwifiex_ids); @@ -40,7 +40,7 @@ static struct sdio_driver mwifiex_sdio = { .name = "mwifiex_sdio", -@@ -276,7 +282,9 @@ +@@ -276,7 +282,9 @@ static struct sdio_driver mwifiex_sdio = .remove = mwifiex_sdio_remove, .drv = { .owner = THIS_MODULE, 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 35b26338ffea..65702735b17c 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 -@@ -2298,7 +2298,7 @@ +@@ -2298,7 +2298,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch index cbbf16fb16b5..e9d4dc31d07a 100644 --- a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch +++ b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_util.patch @@ -1,6 +1,6 @@ --- a/net/wireless/util.c +++ b/net/wireless/util.c -@@ -816,7 +816,7 @@ +@@ -816,7 +816,7 @@ int cfg80211_change_iface(struct cfg8021 return -EOPNOTSUPP; /* if it's part of a bridge, reject changing type to station/ibss */ diff --git a/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch b/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch index 0a2ac04d82f7..9f25775b49e6 100644 --- a/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch +++ b/patches/collateral-evolutions/network/32-remove-ns-type/net_wireless_sysfs.patch @@ -1,6 +1,6 @@ --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c -@@ -133,12 +133,14 @@ +@@ -133,12 +133,14 @@ static int wiphy_resume(struct device *d return ret; } @@ -15,7 +15,7 @@ struct class ieee80211_class = { .name = "ieee80211", -@@ -148,8 +150,10 @@ +@@ -148,8 +150,10 @@ struct class ieee80211_class = { .dev_uevent = wiphy_uevent, .suspend = wiphy_suspend, .resume = wiphy_resume, diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile index 8160ae02b1ce..e42e0b5817f1 100644 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8180_Makefile @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtl818x/rtl8180/Makefile +++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile -@@ -2,4 +2,4 @@ +@@ -2,4 +2,4 @@ rtl8180-objs := dev.o rtl8225.o sa2400. obj-$(CONFIG_RTL8180) += rtl8180.o diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile index 7ba4696ffe9b..91bbf32733b8 100644 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/drivers_net_wireless_rtl818x_rtl8187_Makefile @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtl818x/rtl8187/Makefile +++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile -@@ -2,4 +2,4 @@ +@@ -2,4 +2,4 @@ rtl8187-objs := dev.o rtl8225.o leds.o obj-$(CONFIG_RTL8187) += rtl8187.o diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile b/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile index cb9f890b2de7..43c1dfb90db6 100644 --- a/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes/net_wireless_Makefile @@ -1,6 +1,6 @@ --- a/net/wireless/Makefile +++ b/net/wireless/Makefile -@@ -20,6 +20,6 @@ +@@ -20,6 +20,6 @@ CFLAGS_trace.o := -I$(src) ccflags-y += -D__CHECK_ENDIAN__ $(obj)/regdb.c: $(src)/db.txt $(src)/genregdb.awk diff --git a/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch b/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch index dbcbd4431015..d8759fe65e9b 100644 --- a/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch +++ b/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -1152,6 +1152,10 @@ +@@ -1152,6 +1152,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); diff --git a/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch b/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch index b09ca7aee4b1..2a3d30440034 100644 --- a/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch +++ b/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/main.c +++ b/drivers/net/wireless/ath/main.c -@@ -59,6 +59,7 @@ +@@ -59,6 +59,7 @@ struct sk_buff *ath_rxbuf_alloc(struct a } EXPORT_SYMBOL(ath_rxbuf_alloc); @@ -8,7 +8,7 @@ void ath_printk(const char *level, const struct ath_common* common, const char *fmt, ...) { -@@ -78,4 +79,24 @@ +@@ -78,4 +79,24 @@ void ath_printk(const char *level, const va_end(args); } diff --git a/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlegacy_common.patch b/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlegacy_common.patch index dec9bab87642..d5632b7bf48c 100644 --- a/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlegacy_common.patch +++ b/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlegacy_common.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c -@@ -562,7 +562,9 @@ +@@ -562,7 +562,9 @@ il_leds_init(struct il_priv *il) kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy)); il->led.brightness_set = il_led_brightness_set; il->led.blink_set = il_led_blink_set; diff --git a/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_dvm_led.patch b/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_dvm_led.patch index fdc7708dcc4d..4f579b5ddc2c 100644 --- a/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_dvm_led.patch +++ b/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_dvm_led.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/dvm/led.c +++ b/drivers/net/wireless/iwlwifi/dvm/led.c -@@ -187,7 +187,9 @@ +@@ -187,7 +187,9 @@ void iwl_leds_init(struct iwl_priv *priv wiphy_name(priv->hw->wiphy)); priv->led.brightness_set = iwl_led_brightness_set; priv->led.blink_set = iwl_led_blink_set; diff --git a/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_mvm_led.patch b/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_mvm_led.patch index e4093b571955..fc03324d0e35 100644 --- a/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_mvm_led.patch +++ b/patches/collateral-evolutions/network/38-led-max-brightness/drivers_net_wireless_iwlwifi_mvm_led.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/mvm/led.c +++ b/drivers/net/wireless/iwlwifi/mvm/led.c -@@ -108,7 +108,9 @@ +@@ -108,7 +108,9 @@ int iwl_mvm_leds_init(struct iwl_mvm *mv mvm->led.name = kasprintf(GFP_KERNEL, "%s-led", wiphy_name(mvm->hw->wiphy)); mvm->led.brightness_set = iwl_led_brightness_set; diff --git a/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlegacy_common.patch b/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlegacy_common.patch index 0704ecba676f..74f7f7d6c830 100644 --- a/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlegacy_common.patch +++ b/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlegacy_common.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c -@@ -540,6 +540,7 @@ +@@ -540,6 +540,7 @@ il_led_brightness_set(struct led_classde il_led_cmd(il, on, 0); } @@ -8,7 +8,7 @@ static int il_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) -@@ -548,6 +549,7 @@ +@@ -548,6 +549,7 @@ il_led_blink_set(struct led_classdev *le return il_led_cmd(il, *delay_on, *delay_off); } @@ -16,7 +16,7 @@ void il_leds_init(struct il_priv *il) -@@ -561,7 +563,9 @@ +@@ -561,7 +563,9 @@ il_leds_init(struct il_priv *il) il->led.name = kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy)); il->led.brightness_set = il_led_brightness_set; diff --git a/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlwifi_dvm_led.patch b/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlwifi_dvm_led.patch index b73774aa689d..bdde96a4b7e0 100644 --- a/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlwifi_dvm_led.patch +++ b/patches/collateral-evolutions/network/39-remove_blink_set/drivers_net_wireless_iwlwifi_dvm_led.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/dvm/led.c +++ b/drivers/net/wireless/iwlwifi/dvm/led.c -@@ -162,6 +162,7 @@ +@@ -162,6 +162,7 @@ static void iwl_led_brightness_set(struc iwl_led_cmd(priv, on, 0); } @@ -8,7 +8,7 @@ static int iwl_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) -@@ -170,6 +171,7 @@ +@@ -170,6 +171,7 @@ static int iwl_led_blink_set(struct led_ return iwl_led_cmd(priv, *delay_on, *delay_off); } @@ -16,7 +16,7 @@ void iwl_leds_init(struct iwl_priv *priv) { -@@ -186,7 +188,9 @@ +@@ -186,7 +188,9 @@ void iwl_leds_init(struct iwl_priv *priv priv->led.name = kasprintf(GFP_KERNEL, "%s-led", wiphy_name(priv->hw->wiphy)); priv->led.brightness_set = iwl_led_brightness_set; diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_ethtool.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_ethtool.patch index b070a3325fa9..2f762f1a026b 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_ethtool.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_ethtool.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c -@@ -114,6 +114,13 @@ +@@ -114,6 +114,13 @@ static int atl1c_set_settings(struct net return 0; } @@ -14,7 +14,7 @@ static u32 atl1c_get_msglevel(struct net_device *netdev) { struct atl1c_adapter *adapter = netdev_priv(netdev); -@@ -301,6 +308,11 @@ +@@ -301,6 +308,11 @@ static const struct ethtool_ops atl1c_et .get_link = ethtool_op_get_link, .get_eeprom_len = atl1c_get_eeprom_len, .get_eeprom = atl1c_get_eeprom, 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 e5b937ae192e..f0e6f90c7ffd 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,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -491,6 +491,7 @@ +@@ -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; } @@ -8,7 +8,7 @@ static netdev_features_t atl1c_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -519,6 +520,7 @@ +@@ -519,6 +520,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 @@ +@@ -551,8 +553,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 @@ +@@ -2459,8 +2472,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, -@@ -2479,6 +2494,7 @@ +@@ -2479,6 +2494,7 @@ static int atl1c_init_netdev(struct net_ atl1c_set_ethtool_ops(netdev); /* TODO: add when ready */ @@ -55,7 +55,7 @@ netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_RX | -@@ -2486,6 +2502,14 @@ +@@ -2486,6 +2502,14 @@ static int atl1c_init_netdev(struct net_ NETIF_F_TSO6; netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX; diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_ethtool.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_ethtool.patch index 0e66ca914391..7445db66731d 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_ethtool.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_ethtool.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c -@@ -384,6 +384,11 @@ +@@ -384,6 +384,11 @@ static const struct ethtool_ops atl1e_et .get_eeprom_len = atl1e_get_eeprom_len, .get_eeprom = atl1e_get_eeprom, .set_eeprom = atl1e_set_eeprom, diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch index b0eb801d3f36..d19d43a5b744 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -375,6 +375,7 @@ +@@ -375,6 +375,7 @@ static int atl1e_set_mac_addr(struct net return 0; } @@ -8,7 +8,7 @@ static netdev_features_t atl1e_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -400,6 +401,7 @@ +@@ -400,6 +401,7 @@ static int atl1e_set_features(struct net return 0; } @@ -16,7 +16,7 @@ /** * atl1e_change_mtu - Change the Maximum Transfer Unit -@@ -1925,7 +1927,11 @@ +@@ -1925,7 +1927,11 @@ void atl1e_down(struct atl1e_adapter *ad * reschedule our watchdog timer */ set_bit(__AT_DOWN, &adapter->flags); @@ -28,7 +28,7 @@ /* reset MAC to disable all RX/TX */ atl1e_reset_hw(&adapter->hw); -@@ -2195,8 +2201,10 @@ +@@ -2195,8 +2201,10 @@ static const struct net_device_ops atl1e .ndo_set_rx_mode = atl1e_set_multi, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1e_set_mac_addr, @@ -39,7 +39,7 @@ .ndo_change_mtu = atl1e_change_mtu, .ndo_do_ioctl = atl1e_ioctl, .ndo_tx_timeout = atl1e_tx_timeout, -@@ -2216,10 +2224,15 @@ +@@ -2216,10 +2224,15 @@ static int atl1e_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1e_set_ethtool_ops(netdev); diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch index 08c85bd02dc7..e44aee89b915 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -2917,8 +2917,10 @@ +@@ -2917,8 +2917,10 @@ static const struct net_device_ops atl1_ .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1_set_mac, .ndo_change_mtu = atl1_change_mtu, @@ -11,7 +11,7 @@ .ndo_do_ioctl = atlx_ioctl, .ndo_tx_timeout = atlx_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER -@@ -3028,11 +3030,13 @@ +@@ -3028,11 +3030,13 @@ static int atl1_probe(struct pci_dev *pd netdev->features |= NETIF_F_SG; netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); @@ -25,7 +25,7 @@ /* * patch for some L1 of old version, -@@ -3645,6 +3649,14 @@ +@@ -3645,6 +3649,14 @@ static int atl1_set_pauseparam(struct ne return 0; } @@ -40,7 +40,7 @@ static void atl1_get_strings(struct net_device *netdev, u32 stringset, u8 *data) { -@@ -3717,4 +3729,10 @@ +@@ -3717,4 +3729,10 @@ static const struct ethtool_ops atl1_eth .nway_reset = atl1_nway_reset, .get_ethtool_stats = atl1_get_ethtool_stats, .get_sset_count = atl1_get_sset_count, diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch index 2a2681c8d5ab..a9ce7583f9a1 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c -@@ -396,6 +396,7 @@ +@@ -396,6 +396,7 @@ static void atl2_restore_vlan(struct atl atl2_vlan_mode(adapter->netdev, adapter->netdev->features); } @@ -8,7 +8,7 @@ static netdev_features_t atl2_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -421,6 +422,7 @@ +@@ -421,6 +422,7 @@ static int atl2_set_features(struct net_ return 0; } @@ -16,7 +16,7 @@ static void atl2_intr_rx(struct atl2_adapter *adapter) { -@@ -1319,8 +1321,10 @@ +@@ -1319,8 +1321,10 @@ static const struct net_device_ops atl2_ .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl2_set_mac, .ndo_change_mtu = atl2_change_mtu, @@ -27,7 +27,7 @@ .ndo_do_ioctl = atl2_ioctl, .ndo_tx_timeout = atl2_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER -@@ -1417,8 +1421,12 @@ +@@ -1417,8 +1421,12 @@ static int atl2_probe(struct pci_dev *pd err = -EIO; @@ -40,7 +40,7 @@ /* Init PHY as early as possible due to power saving issue */ atl2_phy_init(&adapter->hw); -@@ -1838,6 +1846,13 @@ +@@ -1838,6 +1846,13 @@ static int atl2_set_settings(struct net_ return 0; } @@ -54,7 +54,7 @@ static u32 atl2_get_msglevel(struct net_device *netdev) { return 0; -@@ -2107,6 +2122,14 @@ +@@ -2107,6 +2122,14 @@ static const struct ethtool_ops atl2_eth .get_eeprom_len = atl2_get_eeprom_len, .get_eeprom = atl2_get_eeprom, .set_eeprom = atl2_set_eeprom, diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch index b0304171ca83..6dd82879782a 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atlx.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c -@@ -254,6 +254,7 @@ +@@ -254,6 +254,7 @@ static void atlx_restore_vlan(struct atl atlx_vlan_mode(adapter->netdev, adapter->netdev->features); } @@ -8,7 +8,7 @@ static netdev_features_t atlx_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -279,5 +280,6 @@ +@@ -279,5 +280,6 @@ static int atlx_set_features(struct net_ return 0; } diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch index 2704449a2303..50d057e5f16b 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_wireless_ath_ath6kl_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c -@@ -1116,6 +1116,7 @@ +@@ -1116,6 +1116,7 @@ static struct net_device_stats *ath6kl_g return &vif->net_stats; } @@ -8,7 +8,7 @@ static int ath6kl_set_features(struct net_device *dev, netdev_features_t features) { -@@ -1148,6 +1149,7 @@ +@@ -1148,6 +1149,7 @@ static int ath6kl_set_features(struct ne return err; } @@ -16,7 +16,7 @@ static void ath6kl_set_multicast_list(struct net_device *ndev) { -@@ -1295,7 +1297,9 @@ +@@ -1295,7 +1297,9 @@ static const struct net_device_ops ath6k .ndo_stop = ath6kl_close, .ndo_start_xmit = ath6kl_data_tx, .ndo_get_stats = ath6kl_get_stats, @@ -26,7 +26,7 @@ .ndo_set_rx_mode = ath6kl_set_multicast_list, }; -@@ -1312,7 +1316,11 @@ +@@ -1312,7 +1316,11 @@ void init_netdev(struct net_device *dev) WMI_MAX_TX_META_SZ + ATH6KL_HTC_ALIGN_BYTES, 4); 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 4d290197c1ed..be71278419be 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 -@@ -5669,7 +5669,9 @@ +@@ -5669,7 +5669,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/43-rename_pm_qos_request/drivers_net_wireless_ipw2x00_ipw2100.patch b/patches/collateral-evolutions/network/43-rename_pm_qos_request/drivers_net_wireless_ipw2x00_ipw2100.patch index da12bc150a90..d000d913d3d5 100644 --- a/patches/collateral-evolutions/network/43-rename_pm_qos_request/drivers_net_wireless_ipw2x00_ipw2100.patch +++ b/patches/collateral-evolutions/network/43-rename_pm_qos_request/drivers_net_wireless_ipw2x00_ipw2100.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -175,7 +175,11 @@ +@@ -175,7 +175,11 @@ that only one external action is invoked #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver" #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" diff --git a/patches/collateral-evolutions/network/45-remove-platform-id-table/drivers_net_wireless_ti_wl12xx_main.patch b/patches/collateral-evolutions/network/45-remove-platform-id-table/drivers_net_wireless_ti_wl12xx_main.patch index 803c3973a570..c2a040da2115 100644 --- a/patches/collateral-evolutions/network/45-remove-platform-id-table/drivers_net_wireless_ti_wl12xx_main.patch +++ b/patches/collateral-evolutions/network/45-remove-platform-id-table/drivers_net_wireless_ti_wl12xx_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wl12xx/main.c +++ b/drivers/net/wireless/ti/wl12xx/main.c -@@ -1815,16 +1815,20 @@ +@@ -1815,16 +1815,20 @@ out: return wlcore_remove(pdev); } 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 bfce3d092917..ff3ac79dbd3c 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 -@@ -2066,16 +2066,24 @@ +@@ -2066,16 +2066,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/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch b/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch index cf7a04af6729..45234aa066b9 100644 --- a/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch +++ b/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c -@@ -371,8 +371,10 @@ +@@ -371,8 +371,10 @@ void mwifiex_set_trans_start(struct net_ { int i; diff --git a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch index 279dfdde8bd8..0c0e7e785da9 100644 --- a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch +++ b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -3456,11 +3456,11 @@ +@@ -3456,11 +3456,11 @@ static void b43_op_tx(struct ieee80211_h } B43_WARN_ON(skb_shinfo(skb)->nr_frags); diff --git a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43legacy_main.patch b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43legacy_main.patch index e1b38ab01658..8da8a05a64ae 100644 --- a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43legacy_main.patch +++ b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43legacy_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c -@@ -2529,11 +2529,11 @@ +@@ -2529,11 +2529,11 @@ static void b43legacy_op_tx(struct ieee8 } B43legacy_WARN_ON(skb_shinfo(skb)->nr_frags); diff --git a/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch b/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch index ec381372beae..a65f196bc26b 100644 --- a/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch +++ b/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c -@@ -962,6 +962,7 @@ +@@ -962,6 +962,7 @@ static int if_usb_suspend(struct usb_int goto out; } @@ -8,7 +8,7 @@ #ifdef CONFIG_OLPC if (machine_is_olpc()) { if (priv->wol_criteria == EHS_REMOVE_WAKEUP) -@@ -970,6 +971,7 @@ +@@ -970,6 +971,7 @@ static int if_usb_suspend(struct usb_int olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); } #endif diff --git a/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch b/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch index 0d4cd7797f75..3ff960d925ff 100644 --- a/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch +++ b/patches/collateral-evolutions/network/52-tty-dev/drivers_bluetooth_hci_ldisc.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c -@@ -421,7 +421,10 @@ +@@ -421,7 +421,10 @@ static int hci_uart_register_dev(struct hdev->close = hci_uart_close; hdev->flush = hci_uart_flush; hdev->send = hci_uart_send_frame; diff --git a/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch b/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch index a546b3ae31f2..3e454e21939f 100644 --- a/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch +++ b/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/iwl-debug.c +++ b/drivers/net/wireless/iwlwifi/iwl-debug.c -@@ -76,13 +76,16 @@ +@@ -76,13 +76,16 @@ void __iwl_ ##fn(struct device *dev, con struct va_format vaf = { \ .fmt = fmt, \ }; \ @@ -21,7 +21,7 @@ } __iwl_fn(warn) -@@ -101,13 +104,18 @@ +@@ -101,13 +104,18 @@ void __iwl_err(struct device *dev, bool va_list args; va_start(args, fmt); @@ -41,7 +41,7 @@ trace_iwlwifi_err(&vaf); va_end(args); } -@@ -124,13 +132,19 @@ +@@ -124,13 +132,19 @@ void __iwl_dbg(struct device *dev, va_list args; va_start(args, fmt); diff --git a/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch b/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch index 6dc729461986..183cec252fe3 100644 --- a/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch +++ b/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/trace.c +++ b/net/mac80211/trace.c -@@ -15,12 +15,16 @@ +@@ -15,12 +15,16 @@ void __sdata_info(const char *fmt, ...) struct va_format vaf = { .fmt = fmt, }; @@ -19,7 +19,7 @@ trace_mac80211_info(&vaf); va_end(args); } -@@ -33,10 +37,16 @@ +@@ -33,10 +37,16 @@ void __sdata_dbg(bool print, const char va_list args; va_start(args, fmt); @@ -38,7 +38,7 @@ trace_mac80211_dbg(&vaf); va_end(args); } -@@ -46,12 +56,16 @@ +@@ -46,12 +56,16 @@ void __sdata_err(const char *fmt, ...) struct va_format vaf = { .fmt = fmt, }; @@ -57,7 +57,7 @@ trace_mac80211_err(&vaf); va_end(args); } -@@ -64,10 +78,16 @@ +@@ -64,10 +78,16 @@ void __wiphy_dbg(struct wiphy *wiphy, bo va_list args; va_start(args, fmt); diff --git a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch index e9bd18a1f7a8..e5d395ac21f7 100644 --- a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch +++ b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix/drivers_net_wireless_iwlwifi_iwl-debug.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/iwl-debug.c +++ b/drivers/net/wireless/iwlwifi/iwl-debug.c -@@ -139,8 +139,9 @@ +@@ -139,8 +139,9 @@ void __iwl_dbg(struct device *dev, va_copy(args2, args); vaf.va = &args2; 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 c66d5f280489..103d8f5af90e 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 @@ +@@ -2622,7 +2622,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/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch index b4237c226ad3..593de7b87234 100644 --- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch +++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c -@@ -3060,7 +3060,9 @@ +@@ -3060,7 +3060,9 @@ static int atl1_probe(struct pci_dev *pd /* copy the MAC address out of the EEPROM */ if (atl1_read_mac_addr(&adapter->hw)) { /* mark random mac */ 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 05b6ea90e2aa..ce5b6d73b000 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 @@ +@@ -473,7 +473,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_bcm203x.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bcm203x.patch index 3dba6a3928f4..46466aae63c4 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bcm203x.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bcm203x.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c -@@ -273,7 +273,9 @@ +@@ -273,7 +273,9 @@ static struct usb_driver bcm203x_driver .probe = bcm203x_probe, .disconnect = bcm203x_disconnect, .id_table = bcm203x_table, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch index 0830697adeb5..8eb2e3edb9eb 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bfusb.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c -@@ -745,7 +745,9 @@ +@@ -745,7 +745,9 @@ static struct usb_driver bfusb_driver = .probe = bfusb_probe, .disconnect = bfusb_disconnect, .id_table = bfusb_table, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch index ee06c08489a2..180a54e9fe2b 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_bpa10x.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c -@@ -504,7 +504,9 @@ +@@ -504,7 +504,9 @@ static struct usb_driver bpa10x_driver = .probe = bpa10x_probe, .disconnect = bpa10x_disconnect, .id_table = bpa10x_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 5a0cf012699d..9a52c6b05d20 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 -@@ -1234,7 +1234,9 @@ +@@ -1234,7 +1234,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_wireless_at76c50x-usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_at76c50x-usb.patch index b210ec15a7b5..e306366d8be2 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_at76c50x-usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_at76c50x-usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c -@@ -2451,7 +2451,9 @@ +@@ -2451,7 +2451,9 @@ static struct usb_driver at76_driver = { .probe = at76_probe, .disconnect = at76_disconnect, .id_table = dev_table, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath6kl_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath6kl_usb.patch index 300813a85269..8d61b4f9b398 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath6kl_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath6kl_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath6kl/usb.c +++ b/drivers/net/wireless/ath/ath6kl/usb.c -@@ -1207,7 +1207,9 @@ +@@ -1207,7 +1207,9 @@ static struct usb_driver ath6kl_usb_driv .disconnect = ath6kl_usb_remove, .id_table = ath6kl_usb_ids, .supports_autosuspend = true, 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 3de2052b9fb6..6882f082950b 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 @@ +@@ -1373,7 +1373,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_ath_carl9170_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_carl9170_usb.patch index b5d5530ceb84..cbd0ee507f31 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_carl9170_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_carl9170_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c -@@ -1166,7 +1166,9 @@ +@@ -1166,7 +1166,9 @@ static struct usb_driver carl9170_driver .resume = carl9170_usb_resume, .reset_resume = carl9170_usb_resume, #endif /* CONFIG_PM */ diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_brcm80211_brcmfmac_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_brcm80211_brcmfmac_usb.patch index b5fa593b6c74..aa2ffedf09e9 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_brcm80211_brcmfmac_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_brcm80211_brcmfmac_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c -@@ -1498,7 +1498,9 @@ +@@ -1498,7 +1498,9 @@ static struct usb_driver brcmf_usbdrvr = .resume = brcmf_usb_resume, .reset_resume = brcmf_usb_reset_resume, .supports_autosuspend = 1, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_if_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_if_usb.patch index 7c30cc5c5c3b..d7d3bb3688d8 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_if_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_if_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c -@@ -1015,7 +1015,9 @@ +@@ -1015,7 +1015,9 @@ static struct usb_driver if_usb_driver = .suspend = if_usb_suspend, .resume = if_usb_resume, .reset_resume = if_usb_resume, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_tf_if_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_tf_if_usb.patch index 22466f265fd4..421c6307a3a9 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_tf_if_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_libertas_tf_if_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas_tf/if_usb.c +++ b/drivers/net/wireless/libertas_tf/if_usb.c -@@ -922,7 +922,9 @@ +@@ -922,7 +922,9 @@ static struct usb_driver if_usb_driver = .id_table = if_usb_table, .suspend = if_usb_suspend, .resume = if_usb_resume, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_orinoco_orinoco_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_orinoco_orinoco_usb.patch index c2af629c7e56..5272011b6701 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_orinoco_orinoco_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_orinoco_orinoco_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c -@@ -1758,7 +1758,9 @@ +@@ -1758,7 +1758,9 @@ static struct usb_driver orinoco_driver .probe = ezusb_probe, .disconnect = ezusb_disconnect, .id_table = ezusb_table, 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 8f4397ba4cf4..c419b276cfe5 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 @@ +@@ -1140,7 +1140,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/62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch index fa077acbd0cc..7216a7bbaca0 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rndis_wlan.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3757,7 +3757,9 @@ +@@ -3757,7 +3757,9 @@ static struct usb_driver rndis_wlan_driv .disconnect = usbnet_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch index adb8e06a4951..f2a644eb76a9 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c -@@ -1989,7 +1989,9 @@ +@@ -1989,7 +1989,9 @@ static struct usb_driver rt2500usb_drive .suspend = rt2x00usb_suspend, .resume = rt2x00usb_resume, .reset_resume = rt2x00usb_resume, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch index bf384886ce01..30b9506885b1 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2800usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -1375,7 +1375,9 @@ +@@ -1375,7 +1375,9 @@ static struct usb_driver rt2800usb_drive .suspend = rt2x00usb_suspend, .resume = rt2x00usb_resume, .reset_resume = rt2x00usb_resume, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch index 7955ace2698d..6e145fd7a54b 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c -@@ -2536,7 +2536,9 @@ +@@ -2536,7 +2536,9 @@ static struct usb_driver rt73usb_driver .suspend = rt2x00usb_suspend, .resume = rt2x00usb_resume, .reset_resume = rt2x00usb_resume, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch index ead8be9f2d9f..a18bb3a393e4 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtl818x_rtl8187_dev.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c -@@ -1673,7 +1673,9 @@ +@@ -1673,7 +1673,9 @@ static struct usb_driver rtl8187_driver .id_table = rtl8187_table, .probe = rtl8187_probe, .disconnect = rtl8187_disconnect, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch index 2d446441fa5e..fd1467d1458e 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rtlwifi_rtl8192cu_sw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c -@@ -384,7 +384,9 @@ +@@ -384,7 +384,9 @@ static struct usb_driver rtl8192cu_drive #ifdef CONFIG_AUTOSUSPEND .supports_autosuspend = 1, #endif diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_zd1211rw_zd_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_zd1211rw_zd_usb.patch index 315f7ead1fdb..83f4e424aa46 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_zd1211rw_zd_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_zd1211rw_zd_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c -@@ -1540,7 +1540,9 @@ +@@ -1540,7 +1540,9 @@ static struct usb_driver driver = { .disconnect = disconnect, .pre_reset = pre_reset, .post_reset = post_reset, diff --git a/patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.patch b/patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.patch index 8108b77527bd..64bd1b40ddaa 100644 --- a/patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.patch +++ b/patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/hci_ath.c +++ b/drivers/bluetooth/hci_ath.c -@@ -58,7 +58,11 @@ +@@ -58,7 +58,11 @@ static int ath_wakeup_ar3k(struct tty_st return status; /* Disable Automatic RTSCTS */ diff --git a/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch index 4e93ae5b77be..f9a6c8353a46 100644 --- a/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch +++ b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c -@@ -868,7 +868,11 @@ +@@ -868,7 +868,11 @@ static int rfcomm_tty_ioctl(struct tty_s static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) { diff --git a/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch b/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch index 06e2f0c83c67..53089df09f99 100644 --- a/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch +++ b/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch @@ -8,7 +8,7 @@ #include #include -@@ -1638,10 +1639,17 @@ +@@ -1638,10 +1639,17 @@ static int b44_close(struct net_device * return 0; } @@ -26,7 +26,7 @@ struct b44_hw_stats *hwstat = &bp->hw_stats; unsigned int start; -@@ -2130,7 +2138,11 @@ +@@ -2130,7 +2138,11 @@ static const struct net_device_ops b44_n .ndo_open = b44_open, .ndo_stop = b44_close, .ndo_start_xmit = b44_start_xmit, diff --git a/patches/collateral-evolutions/network/65-ignore-dismantle/drivers_net_wireless_libertas_main.patch b/patches/collateral-evolutions/network/65-ignore-dismantle/drivers_net_wireless_libertas_main.patch index 2ff38063a946..22c04655dca5 100644 --- a/patches/collateral-evolutions/network/65-ignore-dismantle/drivers_net_wireless_libertas_main.patch +++ b/patches/collateral-evolutions/network/65-ignore-dismantle/drivers_net_wireless_libertas_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -592,7 +592,11 @@ +@@ -592,7 +592,11 @@ static int lbs_thread(void *data) /* Reset card, but only when it isn't in the process * of being shutdown anyway. */ diff --git a/patches/collateral-evolutions/network/67-ipv6-dev-list/drivers_net_wireless_iwlwifi_mvm_d3.patch b/patches/collateral-evolutions/network/67-ipv6-dev-list/drivers_net_wireless_iwlwifi_mvm_d3.patch index 7c24bee95ace..aef5ffa9b0ad 100644 --- a/patches/collateral-evolutions/network/67-ipv6-dev-list/drivers_net_wireless_iwlwifi_mvm_d3.patch +++ b/patches/collateral-evolutions/network/67-ipv6-dev-list/drivers_net_wireless_iwlwifi_mvm_d3.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c -@@ -101,7 +101,11 @@ +@@ -101,7 +101,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/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch index cbe824085256..29e4eddefee6 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 -@@ -7728,7 +7728,7 @@ +@@ -7728,7 +7728,7 @@ static int nl80211_parse_wowlan_tcp(stru port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]); else port = 0; diff --git a/patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch b/patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch index 777727848e30..c70ca415bf99 100644 --- a/patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch +++ b/patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1217,7 +1217,11 @@ +@@ -1217,7 +1217,11 @@ static const struct file_operations fops static struct dentry *create_buf_file_handler(const char *filename, struct dentry *parent, diff --git a/patches/collateral-evolutions/network/71-bin_attribute-api-change/drivers_net_wireless_ti_wlcore_main.patch b/patches/collateral-evolutions/network/71-bin_attribute-api-change/drivers_net_wireless_ti_wlcore_main.patch index 16526737ab5c..242566087839 100644 --- a/patches/collateral-evolutions/network/71-bin_attribute-api-change/drivers_net_wireless_ti_wlcore_main.patch +++ b/patches/collateral-evolutions/network/71-bin_attribute-api-change/drivers_net_wireless_ti_wlcore_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -5518,7 +5518,11 @@ +@@ -5518,7 +5518,11 @@ static ssize_t wl1271_sysfs_show_hw_pg_v static DEVICE_ATTR(hw_pg_ver, S_IRUGO, wl1271_sysfs_show_hw_pg_ver, NULL); diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch index 67ffd599f95c..4a898c50c5af 100644 --- a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch +++ b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmsmac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile +++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile -@@ -21,7 +21,7 @@ +@@ -21,7 +21,7 @@ ccflags-y := \ -I$(obj)/phy \ -I$(obj)/../include @@ -9,7 +9,7 @@ mac80211_if.o \ ucode_loader.o \ ampdu.o \ -@@ -43,11 +43,6 @@ +@@ -43,11 +43,6 @@ BRCMSMAC_OFILES := \ brcms_trace_events.o \ debug.o diff --git a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch index 8b4da952e6a4..ad1322bbe5b7 100644 --- a/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch +++ b/patches/collateral-evolutions/network/72-brcm80211-makefiles/brcmutil.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmutil/Makefile +++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile -@@ -19,10 +19,5 @@ +@@ -19,10 +19,5 @@ ccflags-y := \ -I$(obj) \ -I$(obj)/../include