diff options
author | Stuart Hodgson <smhodgson@solarflare.com> | 2012-07-16 12:08:33 -0400 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-09-07 16:13:38 -0400 |
commit | 79d68b370074044d7a9dd789ee103ffe5ef00bda (patch) | |
tree | e516dcdfd499499fa718ddb6bdf6b7c7210c30fc /drivers/net/ethernet/sfc/rx.c | |
parent | 220a60a425146b0e37998cc0b3082f0541aad866 (diff) |
sfc: Add explicit RX queue flag to channel
The PTP channel will have its own RX queue even though it's not
a regular traffic channel.
Original work by Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Stuart Hodgson <smhodgson@solarflare.com>
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/rx.c')
-rw-r--r-- | drivers/net/ethernet/sfc/rx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index 719319b89d7a..e997f83f14f5 100644 --- a/drivers/net/ethernet/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c | |||
@@ -479,7 +479,7 @@ static void efx_rx_packet_gro(struct efx_channel *channel, | |||
479 | skb->ip_summed = ((rx_buf->flags & EFX_RX_PKT_CSUMMED) ? | 479 | skb->ip_summed = ((rx_buf->flags & EFX_RX_PKT_CSUMMED) ? |
480 | CHECKSUM_UNNECESSARY : CHECKSUM_NONE); | 480 | CHECKSUM_UNNECESSARY : CHECKSUM_NONE); |
481 | 481 | ||
482 | skb_record_rx_queue(skb, channel->channel); | 482 | skb_record_rx_queue(skb, channel->rx_queue.core_index); |
483 | 483 | ||
484 | gro_result = napi_gro_frags(napi); | 484 | gro_result = napi_gro_frags(napi); |
485 | } else { | 485 | } else { |
@@ -571,6 +571,9 @@ static void efx_rx_deliver(struct efx_channel *channel, | |||
571 | /* Set the SKB flags */ | 571 | /* Set the SKB flags */ |
572 | skb_checksum_none_assert(skb); | 572 | skb_checksum_none_assert(skb); |
573 | 573 | ||
574 | /* Record the rx_queue */ | ||
575 | skb_record_rx_queue(skb, channel->rx_queue.core_index); | ||
576 | |||
574 | /* Pass the packet up */ | 577 | /* Pass the packet up */ |
575 | netif_receive_skb(skb); | 578 | netif_receive_skb(skb); |
576 | 579 | ||
@@ -608,7 +611,7 @@ void __efx_rx_packet(struct efx_channel *channel, struct efx_rx_buffer *rx_buf) | |||
608 | * at the ethernet header */ | 611 | * at the ethernet header */ |
609 | skb->protocol = eth_type_trans(skb, efx->net_dev); | 612 | skb->protocol = eth_type_trans(skb, efx->net_dev); |
610 | 613 | ||
611 | skb_record_rx_queue(skb, channel->channel); | 614 | skb_record_rx_queue(skb, channel->rx_queue.core_index); |
612 | } | 615 | } |
613 | 616 | ||
614 | if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM))) | 617 | if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM))) |