diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:47:02 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:47:02 -0500 |
| commit | a4d083550a7273b895b44aac8d2ff7e2fdb1f7d5 (patch) | |
| tree | 6f148433641f8c92d6f1eddcb2199a78dbd111a0 /src/network/networkd-netdev-bridge.h | |
| parent | b6d071f1df46eb841ba3f88cdb2b248eaf5f35f8 (diff) | |
| parent | 86e9bb69ae74bd960e1fd427258f41d54240d6d1 (diff) | |
Merge branch 'systemd/parabola' into notsystemd/premove
# Conflicts:
# Makefile.amp
Diffstat (limited to 'src/network/networkd-netdev-bridge.h')
| -rw-r--r-- | src/network/networkd-netdev-bridge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/networkd-netdev-bridge.h b/src/network/networkd-netdev-bridge.h index 4ce0fbb6f9..53f72f1ea5 100644 --- a/src/network/networkd-netdev-bridge.h +++ b/src/network/networkd-netdev-bridge.h @@ -28,10 +28,13 @@ typedef struct Bridge { int mcast_snooping; int vlan_filtering; int stp; + uint16_t priority; + uint16_t default_pvid; usec_t forward_delay; usec_t hello_time; usec_t max_age; + usec_t ageing_time; } Bridge; DEFINE_NETDEV_CAST(BRIDGE, Bridge); |