From 6f4e670768943ec6f175435177be444f4fa84d6c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 19 May 2011 14:52:06 -0700 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 14 +++++++------- patches/03-rfkill.patch | 2 +- patches/04-netns.patch | 12 ++++++------ patches/05-usb.patch | 2 +- patches/09-threaded-irq.patch | 10 +++++----- patches/10-add-wext-handlers-to-netdev.patch | 2 +- patches/11-dev-pm-ops.patch | 4 ++-- patches/14-device-type.patch | 2 +- patches/17-netdev-queue.patch | 4 ++-- patches/25-multicast-list_head.patch | 10 +++++----- patches/30-bridge-port.patch | 4 ++-- patches/31-backport-sk_add_backlog.patch | 2 +- patches/36-workqueue.patch | 2 +- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 626d6d0f8aa5..3b5e33aef3ec 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -34,7 +34,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3440,7 +3440,7 @@ static int rndis_wlan_bind(struct usbnet +@@ -3441,7 +3441,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. */ @@ -45,7 +45,7 @@ without creating a headache on maintenance of the pathes. retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp, --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -698,7 +698,12 @@ static const struct net_device_ops ieee8 +@@ -699,7 +699,12 @@ static const struct net_device_ops ieee8 static void ieee80211_if_setup(struct net_device *dev) { ether_setup(dev); @@ -59,7 +59,7 @@ without creating a headache on maintenance of the pathes. dev->destructor = free_netdev; } -@@ -845,7 +850,7 @@ static void ieee80211_setup_sdata(struct +@@ -846,7 +851,7 @@ static void ieee80211_setup_sdata(struct /* and set some type-dependent values */ sdata->vif.type = type; sdata->vif.p2p = false; @@ -68,7 +68,7 @@ without creating a headache on maintenance of the pathes. sdata->wdev.iftype = type; sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE); -@@ -884,7 +889,7 @@ static void ieee80211_setup_sdata(struct +@@ -885,7 +890,7 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -77,7 +77,7 @@ without creating a headache on maintenance of the pathes. sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; break; -@@ -1135,6 +1140,8 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1136,6 +1141,8 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -86,7 +86,7 @@ without creating a headache on maintenance of the pathes. ndev->needed_headroom = local->tx_headroom + 4*6 /* four MAC addresses */ + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ -@@ -1143,6 +1150,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1144,6 +1151,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; @@ -256,7 +256,7 @@ without creating a headache on maintenance of the pathes. #define LBS_DEB_LEAVE 0x00000002 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1103,7 +1103,7 @@ static const struct net_device_ops hwsim +@@ -1200,7 +1200,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index aac6596ec16a..e623a358cfbd 100644 --- a/patches/03-rfkill.patch +++ b/patches/03-rfkill.patch @@ -42,7 +42,7 @@ This would do the policing from within mac80211. obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o --- a/net/rfkill/core.c +++ b/net/rfkill/core.c -@@ -805,7 +805,7 @@ static int rfkill_resume(struct device * +@@ -658,7 +658,7 @@ static int rfkill_resume(struct device * } static struct class rfkill_class = { diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 39a0ef1373e0..b4c5f0782ff3 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 -@@ -4487,7 +4487,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4593,7 +4593,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); @@ -44,7 +44,7 @@ files... rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), -@@ -726,8 +730,10 @@ static int cfg80211_netdev_notifier_call +@@ -792,8 +796,10 @@ static int cfg80211_netdev_notifier_call mutex_lock(&rdev->devlist_mtx); list_add_rcu(&wdev->list, &rdev->netdev_list); rdev->devlist_generation++; @@ -55,7 +55,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -903,6 +909,7 @@ static struct notifier_block cfg80211_ne +@@ -972,6 +978,7 @@ static struct notifier_block cfg80211_ne .notifier_call = cfg80211_netdev_notifier_call, }; @@ -63,7 +63,7 @@ files... static void __net_exit cfg80211_pernet_exit(struct net *net) { struct cfg80211_registered_device *rdev; -@@ -920,14 +927,17 @@ static void __net_exit cfg80211_pernet_e +@@ -989,14 +996,17 @@ static void __net_exit cfg80211_pernet_e static struct pernet_operations cfg80211_pernet_ops = { .exit = cfg80211_pernet_exit, }; @@ -81,7 +81,7 @@ files... err = wiphy_sysfs_init(); if (err) -@@ -962,8 +972,10 @@ out_fail_nl80211: +@@ -1031,8 +1041,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -92,7 +92,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -975,7 +987,9 @@ static void __exit cfg80211_exit(void) +@@ -1044,7 +1056,9 @@ static void __exit cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/05-usb.patch b/patches/05-usb.patch index b48a48e31b3d..27ab5d8e4f9d 100644 --- a/patches/05-usb.patch +++ b/patches/05-usb.patch @@ -2,7 +2,7 @@ USB opt soft_unbid was added as of 2.6.27. --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c -@@ -1078,7 +1078,9 @@ static struct usb_driver p54u_driver = { +@@ -1079,7 +1079,9 @@ static struct usb_driver p54u_driver = { .resume = p54u_resume, .reset_resume = p54u_resume, #endif /* CONFIG_PM */ diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 7fde0673fbf2..d0f1d650b2aa 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -6,7 +6,7 @@ thread in process context as well. --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -3970,8 +3970,13 @@ +@@ -3970,8 +3970,13 @@ redo: if (dev->sdev->bus->bustype == SSB_BUSTYPE_SDIO) { b43_sdio_free_irq(dev); } else { @@ -20,7 +20,7 @@ thread in process context as well. } mutex_lock(&wl->mutex); dev = wl->current_dev; -@@ -4011,9 +4016,17 @@ +@@ -4011,9 +4016,17 @@ static int b43_wireless_core_start(struc goto out; } } else { @@ -38,7 +38,7 @@ thread in process context as well. if (err) { b43err(dev->wl, "Cannot request IRQ-%d\n", dev->sdev->irq); -@@ -4728,6 +4741,10 @@ +@@ -4728,6 +4741,10 @@ static int b43_setup_bands(struct b43_wl static void b43_wireless_core_detach(struct b43_wldev *dev) { @@ -51,7 +51,7 @@ thread in process context as well. b43_release_firmware(dev); --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -770,6 +770,9 @@ struct b43_wldev { +@@ -772,6 +772,9 @@ struct b43_wldev { unsigned int tx_count; unsigned int rx_count; #endif @@ -122,7 +122,7 @@ thread in process context as well. return 0; --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h -@@ -583,6 +583,10 @@ struct wl1271 { +@@ -593,6 +593,10 @@ struct wl1271 { /* Platform limitations */ unsigned int platform_quirks; diff --git a/patches/10-add-wext-handlers-to-netdev.patch b/patches/10-add-wext-handlers-to-netdev.patch index e9e65c8dc89a..55ced4c07378 100644 --- a/patches/10-add-wext-handlers-to-netdev.patch +++ b/patches/10-add-wext-handlers-to-netdev.patch @@ -29,7 +29,7 @@ CONFIG_WIRELESS_EXT in compat-wireless. device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -743,6 +739,15 @@ static int cfg80211_netdev_notifier_call +@@ -809,6 +805,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/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 9ce829e49818..5fe39992f907 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -220,7 +220,7 @@ calls on compat code with only slight modifications. static int __init iwl4965_init(void) --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -4071,7 +4071,12 @@ static struct pci_driver iwl_driver = { +@@ -3919,7 +3919,12 @@ static struct pci_driver iwl_driver = { .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = __devexit_p(iwl_pci_remove), @@ -255,7 +255,7 @@ calls on compat code with only slight modifications. #endif /* CONFIG_PM */ --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h -@@ -514,7 +514,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr +@@ -504,7 +504,12 @@ __le32 iwl_add_beacon_time(struct iwl_pr #ifdef CONFIG_PM int iwl_pci_suspend(struct device *device); int iwl_pci_resume(struct device *device); diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index f05400d555d3..0c4854fb2431 100644 --- a/patches/14-device-type.patch +++ b/patches/14-device-type.patch @@ -8,7 +8,7 @@ compile warning. --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -687,9 +687,11 @@ static void wdev_cleanup_work(struct wor +@@ -752,9 +752,11 @@ static void wdev_cleanup_work(struct wor dev_put(wdev->netdev); } diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index c7a08ee6168e..9343db57d5f5 100644 --- a/patches/17-netdev-queue.patch +++ b/patches/17-netdev-queue.patch @@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was: --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1225,6 +1225,7 @@ void ieee80211_if_remove(struct ieee8021 +@@ -1226,6 +1226,7 @@ void ieee80211_if_remove(struct ieee8021 * Remove all interfaces, may only be called at hardware unregistration * time because it doesn't do RCU-safe list removals. */ @@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was: void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -1242,6 +1243,22 @@ void ieee80211_remove_interfaces(struct +@@ -1243,6 +1244,22 @@ void ieee80211_remove_interfaces(struct unregister_netdevice_many(&unreg_list); list_del(&unreg_list); } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index e5d37d846d92..90dc9b4cd813 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -540,7 +540,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8187_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c -@@ -1913,11 +1913,20 @@ struct wl1271_filter_params { +@@ -2085,11 +2085,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -561,7 +561,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 struct wl1271 *wl = hw->priv; if (unlikely(wl->state == WL1271_STATE_OFF)) -@@ -1930,16 +1939,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -2102,16 +2111,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ @@ -641,7 +641,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return hash.low | ((u64)hash.high << 32); --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c -@@ -718,7 +718,11 @@ static void _dhd_set_multicast_list(dhd_ +@@ -714,7 +714,11 @@ static void _dhd_set_multicast_list(dhd_ netdev_for_each_mc_addr(ha, dev) { if (!cnt) break; @@ -716,7 +716,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -739,7 +739,12 @@ struct ieee80211_local { +@@ -741,7 +741,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ @@ -745,7 +745,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); netif_addr_unlock_bh(sdata->dev); -@@ -602,7 +607,12 @@ static void ieee80211_set_multicast_list +@@ -603,7 +608,12 @@ static void ieee80211_set_multicast_list sdata->flags ^= IEEE80211_SDATA_PROMISC; } spin_lock_bh(&local->filter_lock); diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch index 05b993b29b99..728eedff58de 100644 --- a/patches/30-bridge-port.patch +++ b/patches/30-bridge-port.patch @@ -23,7 +23,7 @@ compat-wireless. --- a/net/wireless/util.c +++ b/net/wireless/util.c -@@ -796,7 +796,7 @@ int cfg80211_change_iface(struct cfg8021 +@@ -801,7 +801,7 @@ int cfg80211_change_iface(struct cfg8021 return -EOPNOTSUPP; /* if it's part of a bridge, reject changing type to station/ibss */ @@ -34,7 +34,7 @@ compat-wireless. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1409,7 +1409,7 @@ static int nl80211_valid_4addr(struct cf +@@ -1486,7 +1486,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/31-backport-sk_add_backlog.patch b/patches/31-backport-sk_add_backlog.patch index 9841c9d38d79..fb722445e8fe 100644 --- a/patches/31-backport-sk_add_backlog.patch +++ b/patches/31-backport-sk_add_backlog.patch @@ -9,7 +9,7 @@ backlog. --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c -@@ -3700,8 +3700,12 @@ static inline int l2cap_data_channel(str +@@ -3698,8 +3698,12 @@ static inline int l2cap_data_channel(str if (!sock_owned_by_user(sk)) { l2cap_ertm_data_rcv(sk, skb); } else { diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch index 501edeca05e4..d67233647b79 100644 --- a/patches/36-workqueue.patch +++ b/patches/36-workqueue.patch @@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -1068,6 +1068,10 @@ static void __exit ieee80211_exit(void) +@@ -1092,6 +1092,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); -- 2.30.2