* [net-next PATCH] ixgbevf: fix unused variable warning
@ 2018-02-28 23:17 Arnd Bergmann
2018-03-02 20:55 ` [Intel-wired-lan] " Alexander Duyck
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2018-02-28 23:17 UTC (permalink / raw)
To: Jeff Kirsher
Cc: Arnd Bergmann, Emil Tantilov, Tony Nguyen, David S. Miller,
intel-wired-lan, netdev, linux-kernel
The new ixgbevf_set_rx_buffer_len() function causes a harmless warnings
in configurations with large page size:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function 'ixgbevf_set_rx_buffer_len':
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:1758:15: error: unused variable 'max_frame' [-Werror=unused-variable]
This rephrases the code so that the compiler can see the use of that
variable, making it slightly easier to read in the process.
Fixes: f15c5ba5b6cd ("ixgbevf: add support for using order 1 pages to receive large frames")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index f37307131eb6..4da449e0a4ba 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1766,12 +1766,12 @@ static void ixgbevf_set_rx_buffer_len(struct ixgbevf_adapter *adapter,
set_ring_build_skb_enabled(rx_ring);
-#if (PAGE_SIZE < 8192)
- if (max_frame <= IXGBEVF_MAX_FRAME_BUILD_SKB)
- return;
+ if (PAGE_SIZE < 8192) {
+ if (max_frame <= IXGBEVF_MAX_FRAME_BUILD_SKB)
+ return;
- set_ring_uses_large_buffer(rx_ring);
-#endif
+ set_ring_uses_large_buffer(rx_ring);
+ }
}
/**
--
2.9.0
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [Intel-wired-lan] [net-next PATCH] ixgbevf: fix unused variable warning
2018-02-28 23:17 [net-next PATCH] ixgbevf: fix unused variable warning Arnd Bergmann
@ 2018-03-02 20:55 ` Alexander Duyck
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Duyck @ 2018-03-02 20:55 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Jeff Kirsher, Netdev, LKML, intel-wired-lan, David S. Miller
On Wed, Feb 28, 2018 at 3:17 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> The new ixgbevf_set_rx_buffer_len() function causes a harmless warnings
> in configurations with large page size:
>
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function 'ixgbevf_set_rx_buffer_len':
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:1758:15: error: unused variable 'max_frame' [-Werror=unused-variable]
>
> This rephrases the code so that the compiler can see the use of that
> variable, making it slightly easier to read in the process.
>
> Fixes: f15c5ba5b6cd ("ixgbevf: add support for using order 1 pages to receive large frames")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> index f37307131eb6..4da449e0a4ba 100644
> --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> @@ -1766,12 +1766,12 @@ static void ixgbevf_set_rx_buffer_len(struct ixgbevf_adapter *adapter,
>
> set_ring_build_skb_enabled(rx_ring);
>
> -#if (PAGE_SIZE < 8192)
> - if (max_frame <= IXGBEVF_MAX_FRAME_BUILD_SKB)
> - return;
> + if (PAGE_SIZE < 8192) {
> + if (max_frame <= IXGBEVF_MAX_FRAME_BUILD_SKB)
> + return;
>
> - set_ring_uses_large_buffer(rx_ring);
> -#endif
> + set_ring_uses_large_buffer(rx_ring);
> + }
> }
>
> /**
The fix looks good to me.
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-02 20:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-28 23:17 [net-next PATCH] ixgbevf: fix unused variable warning Arnd Bergmann
2018-03-02 20:55 ` [Intel-wired-lan] " Alexander Duyck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®