aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 4b05fdf762ab..0ea10f849be8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2029,12 +2029,11 @@ static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
2029static struct netdev_queue *dev_pick_tx(struct net_device *dev, 2029static struct netdev_queue *dev_pick_tx(struct net_device *dev,
2030 struct sk_buff *skb) 2030 struct sk_buff *skb)
2031{ 2031{
2032 u16 queue_index; 2032 int queue_index;
2033 struct sock *sk = skb->sk; 2033 struct sock *sk = skb->sk;
2034 2034
2035 if (sk_tx_queue_recorded(sk)) { 2035 queue_index = sk_tx_queue_get(sk);
2036 queue_index = sk_tx_queue_get(sk); 2036 if (queue_index < 0) {
2037 } else {
2038 const struct net_device_ops *ops = dev->netdev_ops; 2037 const struct net_device_ops *ops = dev->netdev_ops;
2039 2038
2040 if (ops->ndo_select_queue) { 2039 if (ops->ndo_select_queue) {