From 42066d5c7f809f7ffbc157aa07a5d4b1cd5d5060 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 22 Feb 2010 13:15:47 -0800 Subject: [PATCH] ./scripts/admin-update.sh refresh Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 26 ++++++++++++------------ patches/04-netns.patch | 10 ++++----- patches/05-usb.patch | 2 +- patches/08-rename-iwl4965-config.patch | 2 +- patches/14-device-type.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/22-multiqueue.patch | 18 ++++++++-------- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index d57a8c1c9910..7ec687975a8f 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -38,7 +38,7 @@ without creating a headache on maintenance of the pathes. if (unlikely(retval < 0)) { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1260,6 +1260,7 @@ void usbnet_disconnect (struct usb_inter +@@ -1236,6 +1236,7 @@ void usbnet_disconnect (struct usb_inter } EXPORT_SYMBOL_GPL(usbnet_disconnect); @@ -46,7 +46,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops usbnet_netdev_ops = { .ndo_open = usbnet_open, .ndo_stop = usbnet_stop, -@@ -1269,6 +1270,7 @@ static const struct net_device_ops usbne +@@ -1245,6 +1246,7 @@ static const struct net_device_ops usbne .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -54,7 +54,7 @@ without creating a headache on maintenance of the pathes. /*-------------------------------------------------------------------------*/ -@@ -1348,7 +1350,15 @@ usbnet_probe (struct usb_interface *udev +@@ -1324,7 +1326,15 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif @@ -72,7 +72,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -2682,6 +2682,7 @@ static int bcm4320b_early_init(struct us +@@ -2703,6 +2703,7 @@ static int bcm4320b_early_init(struct us return 0; } @@ -80,7 +80,7 @@ without creating a headache on maintenance of the pathes. /* same as rndis_netdev_ops but with local multicast handler */ static const struct net_device_ops rndis_wlan_netdev_ops = { .ndo_open = usbnet_open, -@@ -2692,6 +2693,7 @@ static const struct net_device_ops rndis +@@ -2713,6 +2714,7 @@ static const struct net_device_ops rndis .ndo_validate_addr = eth_validate_addr, .ndo_set_multicast_list = rndis_wlan_set_multicast_list, }; @@ -88,7 +88,7 @@ without creating a headache on maintenance of the pathes. static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf) { -@@ -2739,7 +2741,11 @@ static int rndis_wlan_bind(struct usbnet +@@ -2760,7 +2762,11 @@ 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. */ @@ -211,7 +211,7 @@ without creating a headache on maintenance of the pathes. ieee80211_sdata_set_mesh_id(sdata, --- a/drivers/net/b44.c +++ b/drivers/net/b44.c -@@ -2115,6 +2115,7 @@ static int __devinit b44_get_invariants( +@@ -2107,6 +2107,7 @@ static int __devinit b44_get_invariants( return err; } @@ -219,7 +219,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops b44_netdev_ops = { .ndo_open = b44_open, .ndo_stop = b44_close, -@@ -2130,6 +2131,7 @@ static const struct net_device_ops b44_n +@@ -2122,6 +2123,7 @@ static const struct net_device_ops b44_n .ndo_poll_controller = b44_poll_controller, #endif }; @@ -227,7 +227,7 @@ without creating a headache on maintenance of the pathes. static int __devinit b44_init_one(struct ssb_device *sdev, const struct ssb_device_id *ent) -@@ -2169,9 +2171,26 @@ static int __devinit b44_init_one(struct +@@ -2161,9 +2163,26 @@ static int __devinit b44_init_one(struct bp->rx_pending = B44_DEF_RX_RING_PENDING; bp->tx_pending = B44_DEF_TX_RING_PENDING; @@ -550,7 +550,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 -@@ -995,16 +995,22 @@ static struct device_driver mac80211_hws +@@ -1015,16 +1015,22 @@ static struct device_driver mac80211_hws .name = "mac80211_hwsim" }; @@ -678,7 +678,7 @@ without creating a headache on maintenance of the pathes. atl1e_set_ethtool_ops(netdev); --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c -@@ -2439,6 +2439,7 @@ static void atl1c_shutdown(struct pci_de +@@ -2534,6 +2534,7 @@ static void atl1c_shutdown(struct pci_de atl1c_suspend(pdev, PMSG_SUSPEND); } @@ -686,7 +686,7 @@ without creating a headache on maintenance of the pathes. static const struct net_device_ops atl1c_netdev_ops = { .ndo_open = atl1c_open, .ndo_stop = atl1c_close, -@@ -2455,6 +2456,7 @@ static const struct net_device_ops atl1c +@@ -2550,6 +2551,7 @@ static const struct net_device_ops atl1c .ndo_poll_controller = atl1c_netpoll, #endif }; @@ -694,7 +694,7 @@ without creating a headache on maintenance of the pathes. static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev) { -@@ -2462,7 +2464,23 @@ static int atl1c_init_netdev(struct net_ +@@ -2557,7 +2559,23 @@ static int atl1c_init_netdev(struct net_ pci_set_drvdata(pdev, netdev); netdev->irq = pdev->irq; diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 5bb3c206bc00..58dc92b23769 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -16,7 +16,7 @@ files... }; /* internal helper: get rdev and dev */ -@@ -4189,7 +4191,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4187,7 +4189,9 @@ static int nl80211_wiphy_netns(struct sk err = cfg80211_switch_netns(rdev, net); out_put_net: @@ -65,7 +65,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -825,6 +831,7 @@ static struct notifier_block cfg80211_ne +@@ -827,6 +833,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; -@@ -842,14 +849,17 @@ static void __net_exit cfg80211_pernet_e +@@ -844,14 +851,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) -@@ -884,8 +894,10 @@ out_fail_nl80211: +@@ -886,8 +896,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -102,7 +102,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -897,7 +909,9 @@ static void cfg80211_exit(void) +@@ -899,7 +911,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 1a4fa2036f53..9ff2e1e799a9 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 -@@ -1053,7 +1053,9 @@ static struct usb_driver p54u_driver = { +@@ -1054,7 +1054,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 632444366702..83b7c2a4800c 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 -@@ -3789,10 +3789,10 @@ static void __devexit iwl_pci_remove(str +@@ -3796,10 +3796,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/14-device-type.patch b/patches/14-device-type.patch index c3bbc607c15e..5b6c1266b39a 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 -@@ -1276,13 +1276,17 @@ static const struct net_device_ops usbne +@@ -1252,13 +1252,17 @@ static const struct net_device_ops usbne // precondition: never called in_interrupt diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 38a8758e5fa4..798a08928a50 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 -@@ -2551,7 +2551,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -2565,7 +2565,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index 67673a74fdf0..421c32f23de4 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -46,7 +46,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -266,6 +266,18 @@ +@@ -266,6 +266,18 @@ __le16 ieee80211_ctstoself_duration(stru } EXPORT_SYMBOL(ieee80211_ctstoself_duration); @@ -65,7 +65,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, enum queue_stop_reason reason) { -@@ -286,7 +298,14 @@ +@@ -286,7 +298,14 @@ static void __ieee80211_wake_queue(struc rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) @@ -80,7 +80,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() rcu_read_unlock(); } -@@ -321,7 +340,13 @@ +@@ -321,7 +340,13 @@ static void __ieee80211_stop_queue(struc rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) @@ -96,7 +96,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1564,6 +1564,10 @@ +@@ -1564,6 +1564,10 @@ static void ieee80211_xmit(struct ieee80 return; } @@ -109,7 +109,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() rcu_read_unlock(); --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -660,11 +660,13 @@ +@@ -660,11 +660,13 @@ static void ieee80211_teardown_sdata(str WARN_ON(flushed); } @@ -123,7 +123,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) static const struct net_device_ops ieee80211_dataif_ops = { -@@ -679,6 +681,7 @@ +@@ -679,6 +681,7 @@ static const struct net_device_ops ieee8 }; #endif @@ -131,7 +131,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() static u16 ieee80211_monitor_select_queue(struct net_device *dev, struct sk_buff *skb) { -@@ -711,6 +714,7 @@ +@@ -711,6 +714,7 @@ static u16 ieee80211_monitor_select_queu return ieee80211_downgrade_queue(local, skb); } @@ -139,7 +139,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) static const struct net_device_ops ieee80211_monitorif_ops = { -@@ -735,7 +739,9 @@ +@@ -735,7 +739,9 @@ static void ieee80211_if_setup(struct ne dev->set_multicast_list = ieee80211_set_multicast_list; dev->change_mtu = ieee80211_change_mtu; dev->set_mac_address = ieee80211_change_mac; @@ -149,7 +149,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() dev->open = ieee80211_open; dev->stop = ieee80211_stop; /* we will validate the address ourselves in ->open */ -@@ -787,7 +793,9 @@ +@@ -787,7 +793,9 @@ static void ieee80211_setup_sdata(struct sdata->dev->netdev_ops = &ieee80211_monitorif_ops; #else sdata->dev->hard_start_xmit = ieee80211_monitor_start_xmit; -- 2.30.2