From e63d03eaf5056ab2f1fc9262c915bb477a15ef5b Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 20 Jan 2010 11:33:49 -0800 Subject: [PATCH] ./scripts/admin-update.sh refresh This is based on next-20100120 Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 14 +++++++------- patches/03-rfkill.patch | 2 +- patches/04-netns.patch | 20 ++++++++++---------- patches/09-threaded-irq.patch | 8 ++++---- patches/10-add-wext-handlers-to-netdev.patch | 2 +- patches/13-trace.patch | 4 ++-- patches/14-device-type.patch | 2 +- patches/16-bluetooth.patch | 2 +- patches/17-netdev-queue.patch | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 92ff143d028f..53aa72d30ce1 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -118,7 +118,7 @@ without creating a headache on maintenance of the pathes. static u16 ieee80211_monitor_select_queue(struct net_device *dev, struct sk_buff *skb) -@@ -706,6 +708,7 @@ static u16 ieee80211_monitor_select_queu +@@ -710,6 +712,7 @@ static u16 ieee80211_monitor_select_queu return ieee80211_downgrade_queue(local, skb); } @@ -126,7 +126,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops ieee80211_monitorif_ops = { .ndo_open = ieee80211_open, .ndo_stop = ieee80211_stop, -@@ -716,14 +719,28 @@ static const struct net_device_ops ieee8 +@@ -720,14 +723,28 @@ static const struct net_device_ops ieee8 .ndo_set_mac_address = eth_mac_addr, .ndo_select_queue = ieee80211_monitor_select_queue, }; @@ -155,7 +155,7 @@ without creating a headache on maintenance of the pathes. /* * Helper function to initialise an interface to a specific type. */ -@@ -735,7 +752,11 @@ static void ieee80211_setup_sdata(struct +@@ -739,7 +756,11 @@ static void ieee80211_setup_sdata(struct /* and set some type-dependent values */ sdata->vif.type = type; @@ -167,7 +167,7 @@ without creating a headache on maintenance of the pathes. sdata->wdev.iftype = type; /* only monitor differs */ -@@ -758,7 +779,13 @@ static void ieee80211_setup_sdata(struct +@@ -762,7 +783,13 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -181,7 +181,7 @@ without creating a headache on maintenance of the pathes. sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; break; -@@ -827,6 +854,8 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -831,6 +858,8 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -190,7 +190,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 */ -@@ -835,6 +864,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -839,6 +868,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; @@ -198,7 +198,7 @@ without creating a headache on maintenance of the pathes. ret = dev_alloc_name(ndev, ndev->name); if (ret < 0) -@@ -880,6 +910,10 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -884,6 +914,10 @@ int ieee80211_if_add(struct ieee80211_lo if (ret) goto fail; diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index 8df6fde8e7e4..9e6bb03f068e 100644 --- a/patches/03-rfkill.patch +++ b/patches/03-rfkill.patch @@ -208,7 +208,7 @@ This would do the policing from within mac80211. #include --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -3230,7 +3230,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -3209,7 +3209,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/patches/04-netns.patch b/patches/04-netns.patch index b19178cc0aa7..dcf690cf6640 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -16,7 +16,7 @@ files... }; /* internal helper: get rdev and dev */ -@@ -4206,7 +4208,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4208,7 +4210,9 @@ static int nl80211_wiphy_netns(struct sk err = cfg80211_switch_netns(rdev, net); out_put_net: @@ -28,7 +28,7 @@ files... out_rtnl: --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -228,6 +228,7 @@ int cfg80211_dev_rename(struct cfg80211_ +@@ -223,6 +223,7 @@ int cfg80211_dev_rename(struct cfg80211_ return 0; } @@ -36,7 +36,7 @@ files... int cfg80211_switch_netns(struct cfg80211_registered_device *rdev, struct net *net) { -@@ -263,6 +264,7 @@ int cfg80211_switch_netns(struct cfg8021 +@@ -258,6 +259,7 @@ int cfg80211_switch_netns(struct cfg8021 return err; } @@ -44,7 +44,7 @@ files... static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data) { -@@ -375,7 +377,9 @@ struct wiphy *wiphy_new(const struct cfg +@@ -370,7 +372,9 @@ struct wiphy *wiphy_new(const struct cfg rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT; #endif @@ -54,9 +54,9 @@ files... rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), -@@ -672,8 +676,10 @@ static int cfg80211_netdev_notifier_call +@@ -668,8 +672,10 @@ static int cfg80211_netdev_notifier_call mutex_lock(&rdev->devlist_mtx); - list_add(&wdev->list, &rdev->netdev_list); + list_add_rcu(&wdev->list, &rdev->netdev_list); rdev->devlist_generation++; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) /* can only change netns with wiphy */ @@ -65,7 +65,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -805,6 +811,7 @@ static struct notifier_block cfg80211_ne +@@ -809,6 +815,7 @@ static struct notifier_block cfg80211_ne .notifier_call = cfg80211_netdev_notifier_call, }; @@ -73,7 +73,7 @@ files... static void __net_exit cfg80211_pernet_exit(struct net *net) { struct cfg80211_registered_device *rdev; -@@ -822,14 +829,17 @@ static void __net_exit cfg80211_pernet_e +@@ -826,14 +833,17 @@ static void __net_exit cfg80211_pernet_e static struct pernet_operations cfg80211_pernet_ops = { .exit = cfg80211_pernet_exit, }; @@ -91,7 +91,7 @@ files... err = wiphy_sysfs_init(); if (err) -@@ -864,8 +874,10 @@ out_fail_nl80211: +@@ -868,8 +878,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -102,7 +102,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -877,7 +889,9 @@ static void cfg80211_exit(void) +@@ -881,7 +893,9 @@ static void cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 03900b8d689a..c8cbc54379be 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 -@@ -3915,8 +3915,13 @@ redo: +@@ -3921,8 +3921,13 @@ redo: if (dev->dev->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; -@@ -3956,9 +3961,17 @@ static int b43_wireless_core_start(struc +@@ -3962,9 +3967,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->dev->irq); goto out; -@@ -4665,6 +4678,10 @@ static int b43_setup_bands(struct b43_wl +@@ -4671,6 +4684,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 -@@ -745,6 +745,9 @@ struct b43_wldev { +@@ -753,6 +753,9 @@ struct b43_wldev { unsigned int tx_count; unsigned int rx_count; #endif diff --git a/patches/10-add-wext-handlers-to-netdev.patch b/patches/10-add-wext-handlers-to-netdev.patch index 1abb4452ee01..7499a0257118 100644 --- a/patches/10-add-wext-handlers-to-netdev.patch +++ b/patches/10-add-wext-handlers-to-netdev.patch @@ -13,7 +13,7 @@ the struct wiphy wireless handler. --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -690,6 +690,10 @@ static int cfg80211_netdev_notifier_call +@@ -686,6 +686,10 @@ 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/13-trace.patch b/patches/13-trace.patch index 7a4ddcc6b6f5..12307666f938 100644 --- a/patches/13-trace.patch +++ b/patches/13-trace.patch @@ -6,7 +6,7 @@ in or compat headers. --- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h -@@ -1,7 +1,9 @@ +@@ -27,7 +27,9 @@ #if !defined(__IWLWIFI_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ) #define __IWLWIFI_DEVICE_TRACE @@ -16,7 +16,7 @@ in or compat headers. #include "iwl-dev.h" #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__) -@@ -238,4 +240,6 @@ TRACE_EVENT(iwlwifi_dev_ucode_event, +@@ -264,4 +266,6 @@ TRACE_EVENT(iwlwifi_dev_ucode_event, #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE iwl-devtrace diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index fe0618a14ed7..ef88b87069c5 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 -@@ -640,9 +640,11 @@ static void wdev_cleanup_work(struct wor +@@ -636,9 +636,11 @@ static void wdev_cleanup_work(struct wor dev_put(wdev->netdev); } diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index 19f29758720e..718cafbcbe5c 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -82,7 +82,7 @@ here still, but for now we keep this here. err = put_user(amount, (int __user *) arg); --- a/net/bluetooth/cmtp/capi.c +++ b/net/bluetooth/cmtp/capi.c -@@ -382,7 +382,11 @@ static void cmtp_reset_ctr(struct capi_c +@@ -383,7 +383,11 @@ static void cmtp_reset_ctr(struct capi_c BT_DBG("ctrl %p", ctrl); diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index 74dd787128f8..34224e5d57b5 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 -@@ -950,6 +950,7 @@ void ieee80211_if_remove(struct ieee8021 +@@ -954,6 +954,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; -@@ -966,6 +967,22 @@ void ieee80211_remove_interfaces(struct +@@ -970,6 +971,22 @@ void ieee80211_remove_interfaces(struct mutex_unlock(&local->iflist_mtx); unregister_netdevice_many(&unreg_list); } -- 2.30.2