diff options
| author | David S. Miller <[email protected]> | 2016-08-26 13:13:37 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-08-26 13:13:37 -0700 |
| commit | ed35ca994f97211abdbc87063d8869ead99b508c (patch) | |
| tree | 2bc2ff94ee7c44d90a6773fba11abeb0c121db28 /include/linux/netdevice.h | |
| 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 <[email protected]>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 794bb0733799..d122be9345c7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1562,8 +1562,6 @@ enum netdev_priv_flags { * * @xps_maps: XXX: need comments on this one * - * @offload_fwd_mark: Offload device fwding mark - * * @watchdog_timeo: Represents the timeout that is used by * the watchdog (see dev_watchdog()) * @watchdog_timer: List of timers @@ -1814,9 +1812,6 @@ struct net_device { #ifdef CONFIG_NET_CLS_ACT struct tcf_proto __rcu *egress_cl_list; #endif -#ifdef CONFIG_NET_SWITCHDEV - u32 offload_fwd_mark; -#endif /* These may be needed for future network-power-down code. */ struct timer_list watchdog_timer; |