diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-06 11:45:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-06 21:28:05 -0800 |
| commit | 440b87eac4ca21ccb3f56e7b1f126e0eebcc0f84 (patch) | |
| tree | 07b67f879b9f11356dcf60cf4a8b89d90c971eb1 | |
| parent | 4ccd0bb9bf136911f85a5c1eeb6bdcc259cde5e4 (diff) | |
| download | linux-stable-440b87eac4ca21ccb3f56e7b1f126e0eebcc0f84.tar.gz linux-stable-440b87eac4ca21ccb3f56e7b1f126e0eebcc0f84.tar.bz2 linux-stable-440b87eac4ca21ccb3f56e7b1f126e0eebcc0f84.zip | |
drivers/net: fix build warning in ethernet/sfc/tx.c
Commit ee45fd92c739db5b7950163d91dfe5f016af6d24 ("sfc: Use TX PIO
for sufficiently small packets") introduced the following warning:
drivers/net/ethernet/sfc/tx.c: In function 'efx_enqueue_skb':
drivers/net/ethernet/sfc/tx.c:432:1: warning: label 'finish_packet' defined but not used
Stick the label inside the same #ifdef that the code which calls
it uses. Note that this is only seen for arch that do not set
ARCH_HAS_IOREMAP_WC, such as arm, mips, sparc, ..., as the others
enable the write combining code and hence use the label.
Cc: Jon Cooper <jcooper@solarflare.com>
Cc: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Shradha Shah <sshah@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/sfc/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index c49d1fb16965..75d11fa4eb0a 100644 --- a/drivers/net/ethernet/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c @@ -429,7 +429,9 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb) } /* Transfer ownership of the skb to the final buffer */ +#ifdef EFX_USE_PIO finish_packet: +#endif buffer->skb = skb; buffer->flags = EFX_TX_BUF_SKB | dma_flags; |