From 19edb6316ffb4cf544e7d9089289c971f6b6bd7c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 10 Apr 2012 15:42:33 -0700 Subject: [PATCH] compat-wireless: refresh patches for next-20120410 Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 4 ++-- patches/04-netns.patch | 2 +- patches/05-usb.patch | 2 +- patches/11-dev-pm-ops.patch | 6 +++--- patches/12-iw_handler-changes.patch | 2 +- patches/12-mac80211-disable-tx-status.patch | 4 ++-- patches/15-symbol-export-conflicts.patch | 2 +- patches/16-bluetooth.patch | 4 ++-- patches/22-multiqueue.patch | 2 +- patches/25-multicast-list_head.patch | 4 ++-- patches/30-bridge-port.patch | 2 +- patches/40-netdev-hw-features.patch | 12 ++++++------ patches/42-netlink_seq.patch | 2 +- patches/46-use_other_workqueue.patch | 2 +- patches/61-netdev-addr_assign_type.patch | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 2e230199c33a..6d35b36a70b6 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -170,7 +170,7 @@ without creating a headache on maintenance of the pathes. } EXPORT_SYMBOL(wireless_send_event); -@@ -923,8 +952,13 @@ static int wireless_process_ioctl(struct +@@ -925,8 +954,13 @@ static int wireless_process_ioctl(struct return private(dev, iwr, cmd, info, handler); } /* Old driver API : call driver ioctl handler */ @@ -186,7 +186,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6103,7 +6103,7 @@ static struct net_device *ipw2100_alloc_ +@@ -6114,7 +6114,7 @@ static struct net_device *ipw2100_alloc_ priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 8dcb922efc56..30310acf44f8 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 -@@ -5300,7 +5300,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -5305,7 +5305,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/05-usb.patch b/patches/05-usb.patch index 463f4bda9871..ec6812dd3671 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 -@@ -1080,7 +1080,9 @@ static struct usb_driver p54u_driver = { +@@ -1139,7 +1139,9 @@ static struct usb_driver p54u_driver = { .resume = p54u_resume, .reset_resume = p54u_resume, #endif /* CONFIG_PM */ diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 48fc5273b3da..206b4c9779f6 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 -@@ -2894,6 +2894,9 @@ static struct pci_error_handlers atl1c_e +@@ -2891,6 +2891,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, -@@ -2901,7 +2904,12 @@ static struct pci_driver atl1c_driver = +@@ -2898,7 +2901,12 @@ static struct pci_driver atl1c_driver = .remove = __devexit_p(atl1c_remove), .shutdown = atl1c_shutdown, .err_handler = &atl1c_err_handler, @@ -303,7 +303,7 @@ calls on compat code with only slight modifications. static int __init rtl92ce_module_init(void) --- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c -@@ -384,21 +384,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -378,21 +378,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch index 5b22ef80d662..82e3cabbcfe0 100644 --- a/patches/12-iw_handler-changes.patch +++ b/patches/12-iw_handler-changes.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6106,7 +6106,11 @@ static struct net_device *ipw2100_alloc_ +@@ -6117,7 +6117,11 @@ static struct net_device *ipw2100_alloc_ netdev_attach_ops(dev, &ipw2100_netdev_ops); dev->ethtool_ops = &ipw2100_ethtool_ops; dev->wireless_handlers = &ipw2100_wx_handler_def; diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch index 6f39f7a9d04a..18510eaac22b 100644 --- a/patches/12-mac80211-disable-tx-status.patch +++ b/patches/12-mac80211-disable-tx-status.patch @@ -6,7 +6,7 @@ So we need to just ifdef this part out. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1955,6 +1955,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1954,6 +1954,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail; } @@ -14,7 +14,7 @@ So we need to just ifdef this part out. if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -1993,6 +1994,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1992,6 +1993,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index de8e676f7ed0..3757e8131efd 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 -@@ -3105,7 +3105,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3104,7 +3104,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 649799954c16..8901a3a92147 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -595,7 +595,7 @@ here still, but for now we keep this here. { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1060,8 +1067,12 @@ static struct sock *l2cap_sock_alloc(str +@@ -1056,8 +1063,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -608,7 +608,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -1073,7 +1084,11 @@ static int l2cap_sock_create(struct net +@@ -1069,7 +1080,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index 0c7940c2f1f3..25ba0e576e97 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -30,7 +30,7 @@ in compat. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1475,6 +1475,10 @@ void ieee80211_xmit(struct ieee80211_sub +@@ -1474,6 +1474,10 @@ void ieee80211_xmit(struct ieee80211_sub return; } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 449475fd22a6..8b26983cd298 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -681,7 +681,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h -@@ -169,14 +169,28 @@ static inline void drv_bss_info_changed( +@@ -171,14 +171,28 @@ static inline void drv_bss_info_changed( } static inline u64 drv_prepare_multicast(struct ieee80211_local *local, @@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -862,7 +862,12 @@ struct ieee80211_local { +@@ -863,7 +863,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch index c9a410e7afbe..9414eff33a64 100644 --- a/patches/30-bridge-port.patch +++ b/patches/30-bridge-port.patch @@ -34,7 +34,7 @@ compat-wireless. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1638,7 +1638,7 @@ static int nl80211_valid_4addr(struct cf +@@ -1643,7 +1643,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch index a71c240b564c..fd2f645d7059 100644 --- a/patches/40-netdev-hw-features.patch +++ b/patches/40-netdev-hw-features.patch @@ -84,7 +84,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 atl1c_up(adapter); clear_bit(__AT_RESETTING, &adapter->flags); if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) { -@@ -2605,8 +2618,10 @@ static const struct net_device_ops atl1c +@@ -2604,8 +2617,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, -@@ -2626,6 +2641,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2624,6 +2639,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 | -@@ -2633,6 +2649,14 @@ static int atl1c_init_netdev(struct net_ +@@ -2631,6 +2647,14 @@ static int atl1c_init_netdev(struct net_ NETIF_F_TSO6; netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX; @@ -150,7 +150,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /* * atl1e_change_mtu - Change the Maximum Transfer Unit -@@ -1951,7 +1953,11 @@ void atl1e_down(struct atl1e_adapter *ad +@@ -1948,7 +1950,11 @@ void atl1e_down(struct atl1e_adapter *ad * reschedule our watchdog timer */ set_bit(__AT_DOWN, &adapter->flags); @@ -162,7 +162,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /* reset MAC to disable all RX/TX */ atl1e_reset_hw(&adapter->hw); -@@ -2221,8 +2227,10 @@ static const struct net_device_ops atl1e +@@ -2218,8 +2224,10 @@ static const struct net_device_ops atl1e .ndo_set_rx_mode = atl1e_set_multi, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1e_set_mac_addr, @@ -173,7 +173,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 .ndo_change_mtu = atl1e_change_mtu, .ndo_do_ioctl = atl1e_ioctl, .ndo_tx_timeout = atl1e_tx_timeout, -@@ -2243,10 +2251,15 @@ static int atl1e_init_netdev(struct net_ +@@ -2239,10 +2247,15 @@ static int atl1e_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1e_set_ethtool_ops(netdev); diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch index 550bdb27c6b9..b7d51dbfa120 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 -@@ -4293,7 +4293,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -4298,7 +4298,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/46-use_other_workqueue.patch b/patches/46-use_other_workqueue.patch index 57d404dee385..44d36cec5a6f 100644 --- a/patches/46-use_other_workqueue.patch +++ b/patches/46-use_other_workqueue.patch @@ -4,7 +4,7 @@ position before. --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c -@@ -1826,8 +1826,12 @@ int hci_register_dev(struct hci_dev *hde +@@ -1828,8 +1828,12 @@ int hci_register_dev(struct hci_dev *hde write_unlock(&hci_dev_list_lock); diff --git a/patches/61-netdev-addr_assign_type.patch b/patches/61-netdev-addr_assign_type.patch index 37c7efaccada..4c5e1f233ad1 100644 --- a/patches/61-netdev-addr_assign_type.patch +++ b/patches/61-netdev-addr_assign_type.patch @@ -17,7 +17,7 @@ v2.6.36-rc1~571^2~104 atl1c_hw_set_mac_addr(&adapter->hw); -@@ -2772,7 +2774,9 @@ static int __devinit atl1c_probe(struct +@@ -2769,7 +2771,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