Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6

Browse source
This commit is contained in:
David S. Miller 2010-06-09 16:28:25 -07:00
commit ebedb22d2b
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/core/dev.c
View file

@ -2253,11 +2253,9 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
if (skb_rx_queue_recorded(skb)) { if (skb_rx_queue_recorded(skb)) {
u16 index = skb_get_rx_queue(skb); u16 index = skb_get_rx_queue(skb);
if (unlikely(index >= dev->num_rx_queues)) { if (unlikely(index >= dev->num_rx_queues)) {
if (net_ratelimit()) { WARN_ONCE(dev->num_rx_queues > 1, "%s received packet "
pr_warning("%s received packet on queue " "on queue %u, but number of RX queues is %u\n",
"%u, but number of RX queues is %u\n", dev->name, index, dev->num_rx_queues);
dev->name, index, dev->num_rx_queues);
}
goto done; goto done;
} }
rxqueue = dev->_rx + index; rxqueue = dev->_rx + index;