diff options
Diffstat (limited to 'patches/backport-adjustments/flow_dissector.patch')
-rw-r--r-- | patches/backport-adjustments/flow_dissector.patch | 22 |
1 files changed, 5 insertions, 17 deletions
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); |