Skip to content

Commit

Permalink
idpf: make virtchnl2.h self-contained
Browse files Browse the repository at this point in the history
To ease maintaining of virtchnl2.h, which already is messy enough,
make it self-contained by adding missing if_ether.h include due to
%ETH_ALEN usage.
At the same time, virtchnl2_lan_desc.h is not used anywhere in the
file, so move this include to idpf_txrx.h to speed up C preprocessing.

Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://lore.kernel.org/r/20240327142241.1745989-3-aleksander.lobakin@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Alexander Lobakin authored and Jakub Kicinski committed Mar 29, 2024
1 parent ca7e324 commit c00d33f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions drivers/net/ethernet/intel/idpf/idpf_txrx.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include <net/tcp.h>
#include <net/netdev_queues.h>

#include "virtchnl2_lan_desc.h"

#define IDPF_LARGE_MAX_Q 256
#define IDPF_MAX_Q 16
#define IDPF_MIN_Q 2
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/intel/idpf/virtchnl2.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#ifndef _VIRTCHNL2_H_
#define _VIRTCHNL2_H_

#include <linux/if_ether.h>

/* All opcodes associated with virtchnl2 are prefixed with virtchnl2 or
* VIRTCHNL2. Any future opcodes, offloads/capabilities, structures,
* and defines must be prefixed with virtchnl2 or VIRTCHNL2 to avoid confusion.
Expand All @@ -17,8 +19,6 @@
* must remain unchanged over time, so we specify explicit values for all enums.
*/

#include "virtchnl2_lan_desc.h"

/* This macro is used to generate compilation errors if a structure
* is not exactly the correct length.
*/
Expand Down

0 comments on commit c00d33f

Please sign in to comment.