diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-26 13:13:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-26 13:13:37 -0700 |
| commit | ed35ca994f97211abdbc87063d8869ead99b508c (patch) | |
| tree | 2bc2ff94ee7c44d90a6773fba11abeb0c121db28 /net/core/dev.c | |
| parent | 2a313cdf1e6e4cc8cc3f16f976e1abfbdd0626fa (diff) | |
| parent | 1c6c6d221e2b2efb7084b215ef7f59f2bf211b14 (diff) | |
Merge branch 'mlxsw-fw-mark-offload'
Jiri Pirko says:
====================
mlxsw: Introduce support for offload forward mark
Ido says:
This patchset enables the forwarding of certain control packets by the
device instead of relying on the CPU to do the forwarding.
The first two patches simplify the current switchdev offload forward
infrastructure and make it usable for stacked devices. This is done by
moving the packet and port marking to the bridge driver instead of the
switch driver.
Patches 3-5 add the mlxsw specific bits to support the forward mark.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 7feae74ca928..1d5c6dda1988 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3355,16 +3355,6 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) else skb_dst_force(skb); -#ifdef CONFIG_NET_SWITCHDEV - /* Don't forward if offload device already forwarded */ - if (skb->offload_fwd_mark && - skb->offload_fwd_mark == dev->offload_fwd_mark) { - consume_skb(skb); - rc = NET_XMIT_SUCCESS; - goto out; - } -#endif - txq = netdev_pick_tx(dev, skb, accel_priv); q = rcu_dereference_bh(txq->qdisc); |