Skip to content

Commit

Permalink
net-sysfs: get_netdev_queue_index() cleanup
Browse files Browse the repository at this point in the history
Redo commit ed1acc8.

Commit 822b3b2 ("net: Add max rate tx queue
attribute") moved get_netdev_queue_index around, but kept the old version.
Probably because of a reuse of the original patch from before Eric's change to
that function.

Remove one inline keyword, and no need for a loop to find
an index into a table.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Fixes: 822b3b2 ("net: Add max rate tx queue attribute")
Acked-by:  Or Gerlitz <ogerlitz@mellanox.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Thadeu Lima de Souza Cascardo authored and David S. Miller committed Sep 17, 2015
1 parent d24c8f2 commit c4047f5
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions net/core/net-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1004,15 +1004,12 @@ static ssize_t show_trans_timeout(struct netdev_queue *queue,
}

#ifdef CONFIG_XPS
static inline unsigned int get_netdev_queue_index(struct netdev_queue *queue)
static unsigned int get_netdev_queue_index(struct netdev_queue *queue)
{
struct net_device *dev = queue->dev;
int i;

for (i = 0; i < dev->num_tx_queues; i++)
if (queue == &dev->_tx[i])
break;
unsigned int i;

i = queue - dev->_tx;
BUG_ON(i >= dev->num_tx_queues);

return i;
Expand Down

0 comments on commit c4047f5

Please sign in to comment.