diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-23 11:01:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-24 13:58:23 -0500 |
commit | d96d7dc9f19aafe4dd5f2f84d09653e14d2e8d8b (patch) | |
tree | e8641c1f250a24517713474eb6fd4140010b5683 /drivers/net/sfc/rx.c | |
parent | 9e0c8a5bab7190a31d6f2cba28999457dd4d9b7c (diff) |
sfc: Remove redundant gotos from __efx_rx_packet()
This function no longer has any common cleanup code.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/rx.c')
-rw-r--r-- | drivers/net/sfc/rx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c index a60c7188fdad..32cfe40881cc 100644 --- a/drivers/net/sfc/rx.c +++ b/drivers/net/sfc/rx.c | |||
@@ -564,7 +564,7 @@ void __efx_rx_packet(struct efx_channel *channel, | |||
564 | if (unlikely(efx->loopback_selftest)) { | 564 | if (unlikely(efx->loopback_selftest)) { |
565 | efx_loopback_rx_packet(efx, rx_buf->data, rx_buf->len); | 565 | efx_loopback_rx_packet(efx, rx_buf->data, rx_buf->len); |
566 | efx_free_rx_buffer(efx, rx_buf); | 566 | efx_free_rx_buffer(efx, rx_buf); |
567 | goto done; | 567 | return; |
568 | } | 568 | } |
569 | 569 | ||
570 | if (rx_buf->skb) { | 570 | if (rx_buf->skb) { |
@@ -580,7 +580,7 @@ void __efx_rx_packet(struct efx_channel *channel, | |||
580 | 580 | ||
581 | if (likely(checksummed || rx_buf->page)) { | 581 | if (likely(checksummed || rx_buf->page)) { |
582 | efx_rx_packet_lro(channel, rx_buf, checksummed); | 582 | efx_rx_packet_lro(channel, rx_buf, checksummed); |
583 | goto done; | 583 | return; |
584 | } | 584 | } |
585 | 585 | ||
586 | /* We now own the SKB */ | 586 | /* We now own the SKB */ |
@@ -601,9 +601,6 @@ void __efx_rx_packet(struct efx_channel *channel, | |||
601 | 601 | ||
602 | /* Update allocation strategy method */ | 602 | /* Update allocation strategy method */ |
603 | channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB; | 603 | channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB; |
604 | |||
605 | done: | ||
606 | ; | ||
607 | } | 604 | } |
608 | 605 | ||
609 | void efx_rx_strategy(struct efx_channel *channel) | 606 | void efx_rx_strategy(struct efx_channel *channel) |