From cd3952d4c19aa05672edce9cf63d506fbf18b45e Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Sun, 6 May 2012 20:35:11 -0700 Subject: [PATCH] compat-wireless: synch with next-20120504 Happy cinco de Mayo. Signed-off-by: Luis R. Rodriguez --- patches/0001-netdev_ops.patch | 4 ++-- patches/02-ksize.patch | 4 ++-- patches/04-netns.patch | 2 +- patches/09-cfg80211-wext-padding.patch | 2 +- patches/11-dev-pm-ops.patch | 4 ++-- patches/14-device-type.patch | 2 +- patches/25-multicast-list_head.patch | 6 +++--- patches/29-sdio_no_suspend.patch | 8 ++++---- patches/40-netdev-hw-features.patch | 14 +++++++------- patches/42-netlink_seq.patch | 2 +- patches/54-get_ts_info.patch | 2 +- patches/61-netdev-addr_assign_type.patch | 6 +++--- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch index dc55be4b8913..02f505845885 100644 --- a/patches/0001-netdev_ops.patch +++ b/patches/0001-netdev_ops.patch @@ -49,7 +49,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 if (unlikely(retval < 0)) { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1387,7 +1387,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1388,7 +1388,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif @@ -201,7 +201,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 atl1e_set_ethtool_ops(netdev); --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2345,7 +2345,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2418,7 +2418,7 @@ static int atl1c_init_netdev(struct net_ SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); diff --git a/patches/02-ksize.patch b/patches/02-ksize.patch index 0c8c89ca1833..287ec251adea 100644 --- a/patches/02-ksize.patch +++ b/patches/02-ksize.patch @@ -37,7 +37,7 @@ of the situation. priv->keys[index].key = kzalloc(key_len, GFP_ATOMIC); --- a/net/wireless/scan.c +++ b/net/wireless/scan.c -@@ -633,9 +633,14 @@ cfg80211_bss_update(struct cfg80211_regi +@@ -637,9 +637,14 @@ cfg80211_bss_update(struct cfg80211_regi size_t used = dev->wiphy.bss_priv_size + sizeof(*res); size_t ielen = res->pub.len_proberesp_ies; @@ -52,7 +52,7 @@ of the situation. memcpy(found->pub.proberesp_ies, res->pub.proberesp_ies, ielen); found->pub.len_proberesp_ies = ielen; -@@ -669,9 +674,14 @@ cfg80211_bss_update(struct cfg80211_regi +@@ -673,9 +678,14 @@ cfg80211_bss_update(struct cfg80211_regi (found->pub.information_elements == found->pub.beacon_ies); diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 8b1f04081efd..1a55a3470cfa 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -5338,7 +5338,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -5343,7 +5343,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/09-cfg80211-wext-padding.patch b/patches/09-cfg80211-wext-padding.patch index fec46af7e05f..9b675c245421 100644 --- a/patches/09-cfg80211-wext-padding.patch +++ b/patches/09-cfg80211-wext-padding.patch @@ -30,7 +30,7 @@ moved due to struct enlargements. --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -2023,6 +2023,9 @@ struct wiphy_wowlan_support { +@@ -2041,6 +2041,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index fb5d5668c7d8..a3064de4ee53 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -35,7 +35,7 @@ calls on compat code with only slight modifications. int __init bcma_host_pci_init(void) --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2620,6 +2620,9 @@ static struct pci_error_handlers atl1c_e +@@ -2695,6 +2695,9 @@ static struct pci_error_handlers atl1c_e static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); @@ -45,7 +45,7 @@ calls on compat code with only slight modifications. static struct pci_driver atl1c_driver = { .name = atl1c_driver_name, .id_table = atl1c_pci_tbl, -@@ -2627,7 +2630,12 @@ static struct pci_driver atl1c_driver = +@@ -2702,7 +2705,12 @@ static struct pci_driver atl1c_driver = .remove = __devexit_p(atl1c_remove), .shutdown = atl1c_shutdown, .err_handler = &atl1c_err_handler, diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index 23507ddf424c..9a752ea1296e 100644 --- a/patches/14-device-type.patch +++ b/patches/14-device-type.patch @@ -36,7 +36,7 @@ compile warning. { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1302,13 +1302,17 @@ static const struct net_device_ops usbne +@@ -1303,13 +1303,17 @@ static const struct net_device_ops usbne // precondition: never called in_interrupt diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 6653b1b20b72..2221c40230d0 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -13,7 +13,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -394,7 +394,11 @@ static void atl1c_set_multi(struct net_d +@@ -411,7 +411,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) { @@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2249,7 +2249,11 @@ struct ieee80211_ops { +@@ -2257,7 +2257,11 @@ struct ieee80211_ops { u32 changed); u64 (*prepare_multicast)(struct ieee80211_hw *hw, @@ -681,7 +681,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h -@@ -185,14 +185,28 @@ static inline void drv_bss_info_changed( +@@ -222,14 +222,28 @@ static inline void drv_bss_info_changed( } static inline u64 drv_prepare_multicast(struct ieee80211_local *local, diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index 8a0d936391e4..c276d3822791 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -133,7 +133,7 @@ suspend and resume that are not backported. --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c -@@ -59,7 +59,7 @@ static bool +@@ -69,7 +69,7 @@ static bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) { bool is_err = false; @@ -142,7 +142,7 @@ suspend and resume that are not backported. is_err = atomic_read(&sdiodev->suspend); #endif return is_err; -@@ -68,7 +68,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ +@@ -78,7 +78,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ static void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq) { @@ -151,7 +151,7 @@ suspend and resume that are not backported. int retry = 0; while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); -@@ -546,7 +546,7 @@ static void brcmf_ops_sdio_remove(struct +@@ -589,7 +589,7 @@ static void brcmf_ops_sdio_remove(struct } } @@ -160,7 +160,7 @@ suspend and resume that are not backported. static int brcmf_sdio_suspend(struct device *dev) { mmc_pm_flag_t sdio_flags; -@@ -596,7 +596,7 @@ static struct sdio_driver brcmf_sdmmc_dr +@@ -639,7 +639,7 @@ static struct sdio_driver brcmf_sdmmc_dr .remove = brcmf_ops_sdio_remove, .name = "brcmfmac", .id_table = brcmf_sdmmc_ids, diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch index 40df3885326c..36bc09a89c7a 100644 --- a/patches/40-netdev-hw-features.patch +++ b/patches/40-netdev-hw-features.patch @@ -48,7 +48,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 void atl1c_set_ethtool_ops(struct net_device *netdev) --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -476,6 +476,7 @@ static void atl1c_set_rxbufsize(struct a +@@ -493,6 +493,7 @@ static void atl1c_set_rxbufsize(struct a roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; } @@ -56,7 +56,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 static netdev_features_t atl1c_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -504,6 +505,7 @@ static int atl1c_set_features(struct net +@@ -521,6 +522,7 @@ static int atl1c_set_features(struct net return 0; } @@ -64,7 +64,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /* * atl1c_change_mtu - Change the Maximum Transfer Unit -@@ -536,8 +538,19 @@ static int atl1c_change_mtu(struct net_d +@@ -553,8 +555,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); @@ -83,8 +83,8 @@ Date: Thu Apr 7 07:32:18 2011 +0000 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ atl1c_up(adapter); clear_bit(__AT_RESETTING, &adapter->flags); - if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) { -@@ -2334,8 +2347,10 @@ static const struct net_device_ops atl1c + } +@@ -2407,8 +2420,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, @@ -95,7 +95,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 .ndo_do_ioctl = atl1c_ioctl, .ndo_tx_timeout = atl1c_tx_timeout, .ndo_get_stats = atl1c_get_stats, -@@ -2354,6 +2369,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2427,6 +2442,7 @@ static int atl1c_init_netdev(struct net_ atl1c_set_ethtool_ops(netdev); /* TODO: add when ready */ @@ -103,7 +103,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_RX | -@@ -2361,6 +2377,14 @@ static int atl1c_init_netdev(struct net_ +@@ -2434,6 +2450,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/42-netlink_seq.patch b/patches/42-netlink_seq.patch index 6f42f64775bf..ffbd9f152f18 100644 --- a/patches/42-netlink_seq.patch +++ b/patches/42-netlink_seq.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -4331,7 +4331,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -4336,7 +4336,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/54-get_ts_info.patch b/patches/54-get_ts_info.patch index 0c8cdefb7324..057cd07184c2 100644 --- a/patches/54-get_ts_info.patch +++ b/patches/54-get_ts_info.patch @@ -27,7 +27,7 @@ Date: Tue Apr 3 22:59:17 2012 +0000 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -884,7 +884,9 @@ static const struct ethtool_ops usbnet_e +@@ -885,7 +885,9 @@ static const struct ethtool_ops usbnet_e .get_drvinfo = usbnet_get_drvinfo, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, diff --git a/patches/61-netdev-addr_assign_type.patch b/patches/61-netdev-addr_assign_type.patch index da47c60d85ed..7d6c8dd9f004 100644 --- a/patches/61-netdev-addr_assign_type.patch +++ b/patches/61-netdev-addr_assign_type.patch @@ -7,7 +7,7 @@ v2.6.36-rc1~571^2~104 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -460,7 +460,9 @@ static int atl1c_set_mac_addr(struct net +@@ -477,7 +477,9 @@ static int atl1c_set_mac_addr(struct net memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len); @@ -15,9 +15,9 @@ v2.6.36-rc1~571^2~104 netdev->addr_assign_type &= ~NET_ADDR_RANDOM; +#endif - atl1c_hw_set_mac_addr(&adapter->hw); + atl1c_hw_set_mac_addr(&adapter->hw, adapter->hw.mac_addr); -@@ -2498,7 +2500,9 @@ static int __devinit atl1c_probe(struct +@@ -2571,7 +2573,9 @@ static int __devinit atl1c_probe(struct } if (atl1c_read_mac_addr(&adapter->hw)) { /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ -- 2.30.2