diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-21 20:39:27 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-24 01:35:23 +0100 |
commit | 8e946501aef6e3dd5bac12eb45d24df8248672b0 (patch) | |
tree | 5acad1bbc1f71ad268585a96c1168c7ceed1de06 /patches/backport-adjustments | |
parent | 38009d04f323751d21d01857d3df7dd4571408f4 (diff) |
backports: refresh patches on next-20140221backports-20140221
manual changes were needed on these files:
* patches/backport-adjustments/flow_dissector.patch
* patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
* patches/collateral-evolutions/network/83-select_queue/mac80211.patch
* patches/collateral-evolutions/network/83-select_queue/mwifiex.patch
* patches/collateral-evolutions/network/85-hid_ll_driver/net_bluetooth_hidp_core.patch
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.79 [ 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.29 [ OK ]
27 3.11.10 [ OK ]
28 3.12.10 [ OK ]
29 3.13.2 [ OK ]
30 3.14-rc1 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/backport-adjustments')
-rw-r--r-- | patches/backport-adjustments/dma-buf.patch | 2 | ||||
-rw-r--r-- | patches/backport-adjustments/flow_dissector.patch | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/patches/backport-adjustments/dma-buf.patch b/patches/backport-adjustments/dma-buf.patch index cfd78be5..ed70b699 100644 --- a/patches/backport-adjustments/dma-buf.patch +++ b/patches/backport-adjustments/dma-buf.patch @@ -51,7 +51,7 @@ fd_install(fd, dmabuf->file); -@@ -726,17 +752,15 @@ static inline void dma_buf_uninit_debugf +@@ -727,17 +753,15 @@ static inline void dma_buf_uninit_debugf } #endif diff --git a/patches/backport-adjustments/flow_dissector.patch b/patches/backport-adjustments/flow_dissector.patch index 6a6fc165..a4278f4f 100644 --- a/patches/backport-adjustments/flow_dissector.patch +++ b/patches/backport-adjustments/flow_dissector.patch @@ -1,6 +1,6 @@ --- a/compat/net-core-flow_dissector.c +++ b/compat/net-core-flow_dissector.c -@@ -177,241 +177,10 @@ ipv6: +@@ -177,229 +177,10 @@ ipv6: flow->ip_proto = ip_proto; flow->ports = skb_flow_get_ports(skb, nhoff, ip_proto); @@ -152,17 +152,6 @@ - return poff; -} - --static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index) --{ -- if (unlikely(queue_index >= dev->real_num_tx_queues)) { -- net_warn_ratelimited("%s selects TX queue %d, but real number of TX queues is %d\n", -- dev->name, queue_index, -- dev->real_num_tx_queues); -- return 0; -- } -- return queue_index; --} -- -static inline int get_xps_queue(struct net_device *dev, struct sk_buff *skb) -{ -#ifdef CONFIG_XPS @@ -201,7 +190,7 @@ -#endif -} - --u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb) +-static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb) -{ - struct sock *sk = skb->sk; - int queue_index = sk_tx_queue_get(sk); @@ -221,7 +210,6 @@ - - return queue_index; -} --EXPORT_SYMBOL(__netdev_pick_tx); - -struct netdev_queue *netdev_pick_tx(struct net_device *dev, - struct sk_buff *skb, @@ -232,13 +220,13 @@ - if (dev->real_num_tx_queues != 1) { - const struct net_device_ops *ops = dev->netdev_ops; - if (ops->ndo_select_queue) -- queue_index = ops->ndo_select_queue(dev, skb, -- accel_priv); +- queue_index = ops->ndo_select_queue(dev, skb, accel_priv, +- __netdev_pick_tx); - else - queue_index = __netdev_pick_tx(dev, skb); - - if (!accel_priv) -- queue_index = dev_cap_txqueue(dev, queue_index); +- queue_index = netdev_cap_txqueue(dev, queue_index); - } - - skb_set_queue_mapping(skb, queue_index); |