diff options
| author | Ethan Jackson <ethan@nicira.com> | 2011-11-03 13:03:16 -0700 |
|---|---|---|
| committer | Ethan Jackson <ethan@nicira.com> | 2011-11-03 14:01:33 -0700 |
| commit | 75a4ead16d571a4e30cb4b54c5456e30a20c3d78 (patch) | |
| tree | d0bf813017cd0ae0e0386a57a25ad85091a8f18c /vswitchd | |
| parent | fb516ed8c26a1b8c6d2be45eb4de183de242ed87 (diff) | |
cfm: Support tagged CCM PDUs.
This patch also causes eth_compose() to set the l2 and l3 pointers
of the packets which it modifies.
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 2 | ||||
| -rw-r--r-- | vswitchd/vswitch.xml | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 09696d5a..5100b787 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -3005,6 +3005,8 @@ iface_configure_cfm(struct iface *iface) s.mpid = *cfg->cfm_mpid; s.interval = atoi(get_interface_other_config(iface->cfg, "cfm_interval", "0")); + s.ccm_vlan = atoi(get_interface_other_config(iface->cfg, "cfm_ccm_vlan", + "0")); if (s.interval <= 0) { s.interval = 1000; } diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index bcb6b6fd..80d9cdcc 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -1642,6 +1642,13 @@ OpenFlow action. This setting is ignored when CFM is not in extended mode. Defaults to <code>up</code>. </column> + + <column name="other_config" key="cfm_ccm_vlan" + type='{"type": "integer", "minInteger": 1, "maxInteger": 4095}'> + When set, the CFM module will apply a VLAN tag to all CCMs it generates + with the given value. + </column> + </group> <group title="Bonding Configuration"> |