ixgbevf: fix unused variable warning
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Feb 2018 23:17:36 +0000 (00:17 +0100)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 12 Mar 2018 18:05:11 +0000 (11:05 -0700)
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>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

index f373071..4da449e 100644 (file)
@@ -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);
+       }
 }
 
 /**