| Message ID | 20180228231745.366681-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 954b54dea0ebfd2ead48e6bb12a165025227f4b3 |
| Headers | show |
| Series | [net-next] ixgbevf: fix unused variable warning | expand |
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>
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 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(-) -- 2.9.0