summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en_tc.c2
-rw-r--r--include/linux/mlx5/mlx5_ifc.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index b4967a0ff8c7..1b446307f448 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1827,6 +1827,7 @@ static int parse_cls_flower(struct mlx5e_priv *priv,
struct pedit_headers {
struct ethhdr eth;
+ struct vlan_hdr vlan;
struct iphdr ip4;
struct ipv6hdr ip6;
struct tcphdr tcp;
@@ -1884,6 +1885,7 @@ static struct mlx5_fields fields[] = {
OFFLOAD(SMAC_47_16, 4, eth.h_source[0], 0),
OFFLOAD(SMAC_15_0, 2, eth.h_source[4], 0),
OFFLOAD(ETHERTYPE, 2, eth.h_proto, 0),
+ OFFLOAD(FIRST_VID, 2, vlan.h_vlan_TCI, 0),
OFFLOAD(IP_TTL, 1, ip4.ttl, 0),
OFFLOAD(SIPV4, 4, ip4.saddr, 0),
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 3b83288749c6..b0e17c94566c 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -5110,6 +5110,7 @@ enum {
MLX5_ACTION_IN_FIELD_OUT_DIPV6_31_0 = 0x14,
MLX5_ACTION_IN_FIELD_OUT_SIPV4 = 0x15,
MLX5_ACTION_IN_FIELD_OUT_DIPV4 = 0x16,
+ MLX5_ACTION_IN_FIELD_OUT_FIRST_VID = 0x17,
MLX5_ACTION_IN_FIELD_OUT_IPV6_HOPLIMIT = 0x47,
};
='2018-11-20 19:36:01 +0100'>2018-11-201-7/+21 | * xfs: uncached buffer tracing needs to print bnoDave Chinner2018-11-201-1/+4 | * xfs: make xfs_file_remap_range() staticEric Biggers2018-11-191-1/+1 | * xfs: fix shared extent data corruption due to missing cow reservationBrian Foster2018-11-191-0/+1 * | Merge tag 'pm-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa...Linus Torvalds2018-11-231-2/+3 |\ \ | * | exec: make de_thread() freezableChanho Min2018-11-191-2/+3 * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-11-191-1/+10 |\ \ \ | |/ / |/| | | * | rxrpc: Fix life checkDavid Howells2018-11-151-1/+10 * | | ocfs2: free up write context when direct IO failedWengang Wang2018-11-182-2/+19 * | | mm: don't reclaim inodes with many attached pagesRoman Gushchin2018-11-181-2/+5 * | | Merge tag 'fsnotify_for_v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2018-11-162-7/+10 |\ \ \ | * | | fanotify: fix handling of events on child sub-directoryAmir Goldstein2018-11-082-7/+10 * | | | Merge tag 'gfs2-4.20.fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2018-11-162-28/+29 |\ \ \ \ | * | | | gfs2: Fix iomap buffer head reference counting bugAndreas Gruenbacher2018-11-161-23/+17Star | * | | | gfs2: Fix metadata read-ahead during truncate (2)Andreas Gruenbacher2018-11-091-4/+10 | * | | | gfs2: Put bitmap buffers in put_superAndreas Gruenbacher2018-11-091-1/+2 * | | | | Merge tag 'fuse-fixes-4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-11-162-5/+15 |\ \ \ \ \ | * | | | | fuse: fix use-after-free in fuse_direct_IO()Lukas Czerner2018-11-091-1/+3 | * | | | | fuse: fix possibly missed wake-up after abortMiklos Szeredi2018-11-091-3/+9 | * | | | | fuse: fix leaked notify replyMiklos Szeredi2018-11-091-1/+3 | | |/ / / | |/| | | * | | | | Merge tag 'nfs-for-4.20-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2018-11-153-8/+17 |\ \ \ \ \ | * | | | | NFSv4: Fix an Oops during delegation callbacksTrond Myklebust2018-11-132-4/+11 | * | | | | NFSv4: Ensure that the state manager exits the loop on SIGKILLTrond Myklebust2018-11-121-1/+1 | * | | | | NFSv4: Don't exit the state manager without clearing NFS4CLNT_MANAGER_RUNNINGTrond Myklebust2018-11-121-3/+5 | | |_|/ / | |/| | | * | | | | Merge tag 'nfsd-4.20-1' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2018-11-141-0/+3 |\ \ \ \ \ | * | | | | nfsd: COPY and CLONE operations require the saved filehandle to be setScott Mayhew2018-11-081-0/+3 | | |/ / / | |/| | | * | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2018-11-141-3/+3 |\ \ \ \ \ | |_|/ / / |/| | | | | * | | | mnt: fix __detach_mounts infinite loopBenjamin Coddington2018-11-121-3/+3 * | | | | Merge tag 'for-4.20-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2018-11-118-57/+107 |\ \ \ \ \ | * | | | | Btrfs: fix missing delayed iputs on unmountOmar Sandoval2018-11-071-36/+15Star | * | | | | Btrfs: fix data corruption due to cloning of eof blockFilipe Manana2018-11-061-2/+10 | * | | | | Btrfs: fix infinite loop on inode eviction after deduplication of eof blockFilipe Manana2018-11-061-0/+2 | * | | | | Btrfs: fix deadlock on tree root leaf when finding free extentFilipe Manana2018-11-063-11/+46 | * | | | | btrfs: avoid link error with CONFIG_NO_AUTO_INLINEArnd Bergmann2018-11-061-3/+3 | * | | | | btrfs: tree-checker: Fix misleading group system informationShaokun Zhang2018-11-06