lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sfc: Move the end of the non-GRO RX path into its own function

Browse Source 
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
This commit is contained in:
Ben Hutchings
2012-01-23 22:41:30 +00:00
parent f9c762500a
commit 1ddceb4c69
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/ethernet/sfc/rx.c
View File

@@ -568,12 +568,30 @@ out:
channel->rx_pkt_csummed = checksummed; channel->rx_pkt_csummed = checksummed;
} }
static void efx_rx_deliver(struct efx_channel *channel,
struct efx_rx_buffer *rx_buf)
{
struct sk_buff *skb;
/* We now own the SKB */
skb = rx_buf->u.skb;
rx_buf->u.skb = NULL;
/* Set the SKB flags */
skb_checksum_none_assert(skb);
/* Pass the packet up */
netif_receive_skb(skb);
/* Update allocation strategy method */
channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB;
}
/* Handle a received packet. Second half: Touches packet payload. */ /* Handle a received packet. Second half: Touches packet payload. */
void __efx_rx_packet(struct efx_channel *channel, void __efx_rx_packet(struct efx_channel *channel,
struct efx_rx_buffer *rx_buf, bool checksummed) struct efx_rx_buffer *rx_buf, bool checksummed)
{ {
struct efx_nic *efx = channel->efx; struct efx_nic *efx = channel->efx;
struct sk_buff *skb;
u8 *eh = efx_rx_buf_eh(efx, rx_buf); u8 *eh = efx_rx_buf_eh(efx, rx_buf);
/* If we're in loopback test, then pass the packet directly to the /* If we're in loopback test, then pass the packet directly to the
@@ -586,7 +604,7 @@ void __efx_rx_packet(struct efx_channel *channel,
} }
if (!rx_buf->is_page) { if (!rx_buf->is_page) {
skb = rx_buf->u.skb; struct sk_buff *skb = rx_buf->u.skb;
prefetch(skb_shinfo(skb)); prefetch(skb_shinfo(skb));
@@ -606,23 +624,10 @@ void __efx_rx_packet(struct efx_channel *channel,
if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM))) if (unlikely(!(efx->net_dev->features & NETIF_F_RXCSUM)))
checksummed = false; checksummed = false;
if (likely(checksummed || rx_buf->is_page)) { if (likely(checksummed || rx_buf->is_page))
efx_rx_packet_gro(channel, rx_buf, eh, checksummed); efx_rx_packet_gro(channel, rx_buf, eh, checksummed);
return; else
} efx_rx_deliver(channel, rx_buf);
/* We now own the SKB */
skb = rx_buf->u.skb;
rx_buf->u.skb = NULL;
/* Set the SKB flags */
skb_checksum_none_assert(skb);
/* Pass the packet up */
netif_receive_skb(skb);
/* Update allocation strategy method */
channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB;
} }
void efx_rx_strategy(struct efx_channel *channel) void efx_rx_strategy(struct efx_channel *channel)