Commit ebedb22d authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 619baba1 08c801f8

net/core/dev.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -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;