From 436f240152e0df7630552363d8bf6ed59835fc07 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 19 Jan 2014 18:18:32 +0100 Subject: backports: refresh patches on 3.12.8 1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.101 [ OK ] 17 3.1.10 [ OK ] 18 3.2.54 [ OK ] 19 3.3.8 [ OK ] 20 3.4.77 [ OK ] 21 3.5.7 [ OK ] 22 3.6.11 [ OK ] 23 3.7.10 [ OK ] 24 3.8.13 [ OK ] 25 3.9.11 [ OK ] 26 3.10.27 [ OK ] 27 3.11.10 [ OK ] 28 3.12.8 [ OK ] 29 3.13-rc8 [ FAIL ] Signed-off-by: Hauke Mehrtens --- .../network/0001-netdev_ops/usbnet.patch | 2 +- .../drivers_net_wireless_rtlwifi_base.patch | 2 +- .../drivers_net_wireless_iwlwifi_pcie_trans.patch | 4 ++-- .../10-add-wext-handlers-to-netdev/net_wireless_core.patch | 2 +- .../12-mac80211-disable-tx-status/net_mac80211_tx.patch | 4 ++-- .../network/16-bluetooth/net_bluetooth_af_bluetooth.patch | 2 +- .../network/16-bluetooth/net_bluetooth_hci_sock.patch | 4 ++-- .../network/16-bluetooth/net_bluetooth_rfcomm_sock.patch | 2 +- .../network/16-bluetooth/net_bluetooth_sco.patch | 2 +- .../network/22-multiqueue/net_mac80211_tx.patch | 2 +- .../network/36-workqueue/net_mac80211_main.patch | 2 +- .../network/54-get_ts_info/drivers_net_usb_usbnet.patch | 2 +- .../network/61-netdev-addr_assign_type/usbnet.patch | 2 +- .../62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch | 2 +- patches/collateral-evolutions/network/78-usb-sg/usbnet.patch | 12 ++++++------ 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch b/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch index 9ccbc25a..7f68f090 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1619,7 +1619,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1616,7 +1616,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch index ea33c7d8..d968ccb3 100644 --- a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch +++ b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_rtlwifi_base.patch @@ -6,5 +6,5 @@ #include +#include #include + #include - /* diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch index d7f29117..87514e3f 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -793,12 +793,21 @@ void iwl_trans_pcie_free(struct iwl_tran +@@ -790,12 +790,21 @@ void iwl_trans_pcie_free(struct iwl_tran { struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); @@ -22,7 +22,7 @@ iwl_pcie_free_ict(trans); pci_disable_msi(trans_pcie->pci_dev); -@@ -1493,9 +1502,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s +@@ -1490,9 +1499,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s if (iwl_pcie_alloc_ict(trans)) goto out_free_cmd_pool; diff --git a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch index c29b907c..d2c580bf 100644 --- a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch +++ b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch @@ -11,7 +11,7 @@ device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -843,6 +839,15 @@ static int cfg80211_netdev_notifier_call +@@ -846,6 +842,15 @@ static int cfg80211_netdev_notifier_call } wdev->netdev = dev; #ifdef CONFIG_CFG80211_WEXT diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch index ff957c30..680739d4 100644 --- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1995,6 +1995,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1998,6 +1998,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail_rcu; } @@ -8,7 +8,7 @@ if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -2023,6 +2024,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2026,6 +2027,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch index 92852d3b..e199a2cf 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch @@ -25,7 +25,7 @@ if (!err) bt_sock_reclassify_lock(sock->sk, proto); module_put(bt_proto[proto]->owner); -@@ -456,7 +464,11 @@ int bt_sock_ioctl(struct socket *sock, u +@@ -452,7 +460,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch index 923c718f..ae7d2718 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -884,8 +884,13 @@ drop: +@@ -882,8 +882,13 @@ drop: goto done; } @@ -14,7 +14,7 @@ { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -1059,8 +1064,12 @@ static struct proto hci_sk_proto = { +@@ -1057,8 +1062,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch index 8fe9af5b..fbeb1073 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch @@ -14,7 +14,7 @@ { struct sock *sk; -@@ -661,7 +666,11 @@ static int rfcomm_sock_setsockopt_old(st +@@ -660,7 +665,11 @@ static int rfcomm_sock_setsockopt_old(st return err; } diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch index bc0c1282..4b046db7 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch @@ -13,7 +13,7 @@ { struct sock *sk; -@@ -726,7 +730,11 @@ static int sco_sock_recvmsg(struct kiocb +@@ -725,7 +729,11 @@ static int sco_sock_recvmsg(struct kiocb return bt_sock_recvmsg(iocb, sock, msg, len, flags); } diff --git a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch index 083644c4..983752ad 100644 --- a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1478,6 +1478,10 @@ void ieee80211_xmit(struct ieee80211_sub +@@ -1481,6 +1481,10 @@ void ieee80211_xmit(struct ieee80211_sub } } diff --git a/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch b/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch index 043c325f..fae6d383 100644 --- a/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch +++ b/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -1139,6 +1139,10 @@ static void __exit ieee80211_exit(void) +@@ -1140,6 +1140,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); diff --git a/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch b/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch index 6118d591..5e2cfaaf 100644 --- a/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch +++ b/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1029,7 +1029,9 @@ static const struct ethtool_ops usbnet_e +@@ -1026,7 +1026,9 @@ static const struct ethtool_ops usbnet_e .get_drvinfo = usbnet_get_drvinfo, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch index 0a5eba5c..11338bd4 100644 --- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch +++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1675,9 +1675,11 @@ usbnet_probe (struct usb_interface *udev +@@ -1672,9 +1672,11 @@ usbnet_probe (struct usb_interface *udev dev->rx_urb_size = dev->hard_mtu; dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1); diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch index a75e9933..62a6cb13 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_usb_class_cdc-wdm.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c -@@ -1065,7 +1065,9 @@ static struct usb_driver wdm_driver = { +@@ -1063,7 +1063,9 @@ static struct usb_driver wdm_driver = { .post_reset = wdm_post_reset, .id_table = wdm_ids, .supports_autosuspend = 1, diff --git a/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch index 08499d8b..6e2cdfe3 100644 --- a/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch +++ b/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1234,6 +1234,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1231,6 +1231,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); /*-------------------------------------------------------------------------*/ @@ -8,7 +8,7 @@ static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) { unsigned num_sgs, total_len = 0; -@@ -1266,6 +1267,12 @@ static int build_dma_sg(const struct sk_ +@@ -1263,6 +1264,12 @@ static int build_dma_sg(const struct sk_ return 1; } @@ -21,7 +21,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) -@@ -1322,12 +1329,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1319,12 +1326,19 @@ netdev_tx_t usbnet_start_xmit (struct sk if (!(info->flags & FLAG_SEND_ZLP)) { if (!(info->flags & FLAG_MULTI_PACKET)) { length++; @@ -41,7 +41,7 @@ } } else urb->transfer_flags |= URB_ZERO_PACKET; -@@ -1382,7 +1396,9 @@ not_drop: +@@ -1379,7 +1393,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1435,7 +1451,9 @@ static void usbnet_bh (unsigned long par +@@ -1432,7 +1448,9 @@ static void usbnet_bh (unsigned long par rx_process (dev, skb); continue; case tx_done: @@ -61,7 +61,7 @@ case rx_cleanup: usb_free_urb (entry->urb); dev_kfree_skb (skb); -@@ -1790,7 +1808,9 @@ int usbnet_resume (struct usb_interface +@@ -1787,7 +1805,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); -- cgit v1.2.3