diff options
| author | David S. Miller | 2019-08-18 23:13:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-08-18 23:13:23 +0200 |
| commit | 5cbe9102ae2398c0f410fd4f832d9f038e751a29 (patch) | |
| tree | 717dbcde06dcd1d5e1f672e3235a190037315c70 /drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | |
| parent | wimax/i2400m: fix a memory leak bug (diff) | |
| parent | netfilter: nf_tables: map basechain priority to hardware priority (diff) | |
| download | kernel-qcow2-linux-5cbe9102ae2398c0f410fd4f832d9f038e751a29.tar.gz kernel-qcow2-linux-5cbe9102ae2398c0f410fd4f832d9f038e751a29.tar.xz kernel-qcow2-linux-5cbe9102ae2398c0f410fd4f832d9f038e751a29.zip | |
Merge branch 'flow_offload-hardware-priority-fixes'
Pablo Neira Ayuso says:
====================
flow_offload hardware priority fixes
This patchset contains two updates for the flow_offload users:
1) Pass the major tc priority to drivers so they do not have to
lshift it. This is a preparation patch for the fix coming in
patch #2.
2) Set the hardware priority from the netfilter basechain priority,
some drivers break when using the existing hardware priority
number that is set to zero.
v5: fix patch 2/2 to address a clang warning and to simplify
the priority mapping.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 37c0bc699cd9..6c305b6ecad0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -94,7 +94,7 @@ static int tc_fill_entry(struct stmmac_priv *priv, struct stmmac_tc_entry *entry, *frag = NULL; struct tc_u32_sel *sel = cls->knode.sel; u32 off, data, mask, real_off, rem; - u32 prio = cls->common.prio; + u32 prio = cls->common.prio << 16; int ret; /* Only 1 match per entry */ |