Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6 (ebedb22d) · Commits · e / devices / android_kernel_teracube_emerald

net/core/dev.c

+3 −5

Original line number	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)) {
		u16 index = skb_get_rx_queue(skb);
		if (unlikely(index >= dev->num_rx_queues)) {
		if (net_ratelimit()) {
		pr_warning("%s received packet on queue "
		"%u, but number of RX queues is %u\n",
		WARN_ONCE(dev->num_rx_queues > 1, "%s received packet "
		"on queue %u, but number of RX queues is %u\n",
		dev->name, index, dev->num_rx_queues);
		}
		goto done;
		}
		rxqueue = dev->_rx + index;