From 8f16277d970741260ef86152eac94fbcee7d9263 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 16 Feb 2010 15:56:31 -0800 Subject: [PATCH] ./scripts/admin-update.sh refresh for next-20100216 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/08-rename-iwl4965-config.patch | 2 +- patches/10-add-wext-handlers-to-netdev.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/16-bluetooth.patch | 28 ++++++++++---------- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 3f7409069f62..d57a8c1c9910 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -575,7 +575,7 @@ without creating a headache on maintenance of the pathes. dev->tx_queue_len = 0; --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c -@@ -165,8 +165,12 @@ static inline int bnep_net_proto_filter( +@@ -167,8 +167,12 @@ static inline int bnep_net_proto_filter( } #endif @@ -590,7 +590,7 @@ without creating a headache on maintenance of the pathes. { struct bnep_session *s = netdev_priv(dev); struct sock *sk = s->sock->sk; -@@ -207,6 +211,7 @@ static netdev_tx_t bnep_net_xmit(struct +@@ -209,6 +213,7 @@ static netdev_tx_t bnep_net_xmit(struct return NETDEV_TX_OK; } @@ -598,7 +598,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops bnep_netdev_ops = { .ndo_open = bnep_net_open, .ndo_stop = bnep_net_close, -@@ -218,6 +223,16 @@ static const struct net_device_ops bnep_ +@@ -220,6 +225,16 @@ static const struct net_device_ops bnep_ .ndo_change_mtu = eth_change_mtu, }; @@ -615,7 +615,7 @@ without creating a headache on maintenance of the pathes. void bnep_net_setup(struct net_device *dev) { -@@ -226,7 +241,18 @@ void bnep_net_setup(struct net_device *d +@@ -228,7 +243,18 @@ void bnep_net_setup(struct net_device *d dev->addr_len = ETH_ALEN; ether_setup(dev); @@ -636,7 +636,7 @@ without creating a headache on maintenance of the pathes. } --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c -@@ -2219,6 +2219,7 @@ static void atl1e_shutdown(struct pci_de +@@ -2202,6 +2202,7 @@ static void atl1e_shutdown(struct pci_de atl1e_suspend(pdev, PMSG_SUSPEND); } @@ -644,7 +644,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops atl1e_netdev_ops = { .ndo_open = atl1e_open, .ndo_stop = atl1e_close, -@@ -2236,6 +2237,7 @@ static const struct net_device_ops atl1e +@@ -2219,6 +2220,7 @@ static const struct net_device_ops atl1e #endif }; @@ -652,7 +652,7 @@ without creating a headache on maintenance of the pathes. static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev) { -@@ -2243,7 +2245,23 @@ static int atl1e_init_netdev(struct net_ +@@ -2226,7 +2228,23 @@ static int atl1e_init_netdev(struct net_ pci_set_drvdata(pdev, netdev); netdev->irq = pdev->irq; diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index 5f0f0aa454bd..cb5fac30bdd3 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 -@@ -3213,7 +3213,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -3224,7 +3224,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 a9703b14e828..5bb3c206bc00 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -16,7 +16,7 @@ files... }; /* internal helper: get rdev and dev */ -@@ -4208,7 +4210,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4189,7 +4191,9 @@ static int nl80211_wiphy_netns(struct sk err = cfg80211_switch_netns(rdev, net); out_put_net: @@ -54,7 +54,7 @@ files... rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), -@@ -680,8 +684,10 @@ static int cfg80211_netdev_notifier_call +@@ -683,8 +687,10 @@ static int cfg80211_netdev_notifier_call mutex_lock(&rdev->devlist_mtx); list_add_rcu(&wdev->list, &rdev->netdev_list); rdev->devlist_generation++; @@ -65,7 +65,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -821,6 +827,7 @@ static struct notifier_block cfg80211_ne +@@ -825,6 +831,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; -@@ -838,14 +845,17 @@ static void __net_exit cfg80211_pernet_e +@@ -842,14 +849,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) -@@ -880,8 +890,10 @@ out_fail_nl80211: +@@ -884,8 +894,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -102,7 +102,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -893,7 +905,9 @@ static void cfg80211_exit(void) +@@ -897,7 +909,9 @@ static void 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 4d3efea7d1df..1a4fa2036f53 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 -@@ -1052,7 +1052,9 @@ static struct usb_driver p54u_driver = { +@@ -1053,7 +1053,9 @@ static struct usb_driver p54u_driver = { .resume = p54u_resume, .reset_resume = p54u_resume, #endif /* CONFIG_PM */ diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch index 7c95ac985064..632444366702 100644 --- a/patches/08-rename-iwl4965-config.patch +++ b/patches/08-rename-iwl4965-config.patch @@ -16,7 +16,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly. iwlagn-$(CONFIG_IWL5000) += iwl-1000.o --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -3769,10 +3769,10 @@ static void __devexit iwl_pci_remove(str +@@ -3789,10 +3789,10 @@ static void __devexit iwl_pci_remove(str /* Hardware specific file defines the PCI IDs table for that hardware module */ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { diff --git a/patches/10-add-wext-handlers-to-netdev.patch b/patches/10-add-wext-handlers-to-netdev.patch index 8e3358744388..5c4ee959cbbd 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 -@@ -698,6 +698,10 @@ static int cfg80211_netdev_notifier_call +@@ -701,6 +701,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/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 93d5f86b02e8..38a8758e5fa4 100644 --- a/patches/15-symbol-export-conflicts.patch +++ b/patches/15-symbol-export-conflicts.patch @@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our. --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2507,7 +2507,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -2551,7 +2551,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index 14fb691b8ddc..c0353e9e90c7 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -176,7 +176,7 @@ here still, but for now we keep this here. }; --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c -@@ -313,6 +313,7 @@ +@@ -313,6 +313,7 @@ static int hidp_send_report(struct hidp_ return hidp_queue_report(session, buf, rsize); } @@ -184,7 +184,7 @@ here still, but for now we keep this here. static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, unsigned char report_type) { -@@ -332,6 +333,7 @@ +@@ -332,6 +333,7 @@ static int hidp_output_raw_report(struct return -ENOMEM; return count; } @@ -192,7 +192,7 @@ here still, but for now we keep this here. static void hidp_idle_timeout(unsigned long arg) { -@@ -596,10 +598,16 @@ +@@ -596,10 +598,16 @@ static int hidp_session(void *arg) session->input = NULL; } @@ -213,7 +213,7 @@ here still, but for now we keep this here. /* Wakeup user-space polling for socket errors */ session->intr_sock->sk->sk_err = EUNATCH; -@@ -711,6 +719,70 @@ +@@ -711,6 +719,70 @@ static void hidp_close(struct hid_device { } @@ -284,7 +284,7 @@ here still, but for now we keep this here. static int hidp_parse(struct hid_device *hid) { struct hidp_session *session = hid->driver_data; -@@ -815,6 +887,7 @@ +@@ -815,6 +887,7 @@ fault: return err; } @@ -292,7 +292,7 @@ here still, but for now we keep this here. int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock) { -@@ -833,6 +906,39 @@ +@@ -833,6 +906,39 @@ int hidp_add_connection(struct hidp_conn BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size); @@ -332,7 +332,7 @@ here still, but for now we keep this here. down_write(&hidp_session_sem); s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst); -@@ -860,6 +966,7 @@ +@@ -860,6 +966,7 @@ int hidp_add_connection(struct hidp_conn session->flags = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID); session->idle_to = req->idle_to; @@ -340,7 +340,7 @@ here still, but for now we keep this here. if (req->rd_size > 0) { err = hidp_setup_hid(session, req); if (err && err != -ENODEV) -@@ -871,6 +978,16 @@ +@@ -871,6 +978,16 @@ int hidp_add_connection(struct hidp_conn if (err < 0) goto purge; } @@ -357,7 +357,7 @@ here still, but for now we keep this here. __hidp_link_session(session); -@@ -902,6 +1019,7 @@ +@@ -902,6 +1019,7 @@ unlink: session->input = NULL; } @@ -365,7 +365,7 @@ here still, but for now we keep this here. if (session->hid) { hid_destroy_device(session->hid); session->hid = NULL; -@@ -913,10 +1031,15 @@ +@@ -913,10 +1031,15 @@ unlink: purge: skb_queue_purge(&session->ctrl_transmit); skb_queue_purge(&session->intr_transmit); @@ -381,7 +381,7 @@ here still, but for now we keep this here. input_free_device(session->input); kfree(session); return err; -@@ -1006,6 +1129,7 @@ +@@ -1006,6 +1129,7 @@ int hidp_get_conninfo(struct hidp_connin return err; } @@ -389,7 +389,7 @@ here still, but for now we keep this here. static const struct hid_device_id hidp_table[] = { { HID_BLUETOOTH_DEVICE(HID_ANY_ID, HID_ANY_ID) }, { } -@@ -1015,6 +1139,7 @@ +@@ -1015,6 +1139,7 @@ static struct hid_driver hidp_driver = { .name = "generic-bluetooth", .id_table = hidp_table, }; @@ -397,7 +397,7 @@ here still, but for now we keep this here. static int __init hidp_init(void) { -@@ -1024,11 +1149,14 @@ +@@ -1024,11 +1149,14 @@ static int __init hidp_init(void) BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION); @@ -412,7 +412,7 @@ here still, but for now we keep this here. if (ret) goto err_drv; -@@ -1036,13 +1164,16 @@ +@@ -1036,13 +1164,16 @@ static int __init hidp_init(void) err_drv: hid_unregister_driver(&hidp_driver); err: -- 2.30.2