diff options
author | Luca Boccassi <luca.boccassi@gmail.com> | 2018-09-03 10:48:52 +0100 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-09-03 10:49:31 +0100 |
commit | cbcf3d44176009673fbcd7d15671bef56c021f6b (patch) | |
tree | 03ac41bbf9f5f9f238e62de84d43dcce721b8dab /drivers/net/enic/enic.h | |
parent | 1d9284040a0ba38d86e6eeffdb25f36eeb7a44e1 (diff) | |
parent | 6e7cbd63706f3435b9d9a2057a37db1da01db9a7 (diff) |
Merge branch 'upstream-17.11-stable' into 17.11.x
Change-Id: Id5d87fa34325cf80217a1f633c9dc1808e931af8
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/enic/enic.h')
-rw-r--r-- | drivers/net/enic/enic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index a43fddc5..8bbff18c 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -139,6 +139,7 @@ struct enic { u8 adv_filters; u32 flow_filter_mode; u8 filter_tags; + uint8_t ig_vlan_rewrite_mode; /* devargs ig-vlan-rewrite */ unsigned int flags; unsigned int priv_flags; |