diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-01-19 14:51:26 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-01-19 14:53:35 -0800 |
| commit | 7b064a79a8efdcce678c82f21d480c7dc811adfb (patch) | |
| tree | 9c939715abf01feb23b1d2d344dae657b3514b14 /include/openflow | |
| parent | 926947e61c5dfaebad7264859b50e82f0109ab81 (diff) | |
| download | openvswitch-7b064a79a8efdcce678c82f21d480c7dc811adfb.tar.gz | |
nx-match: Allow NXM_NX_TUN_ID and NXM_OF_VLAN_TCI on NXAST_REG_LOAD.
NXM_NX_TUN_ID and NXM_OF_VLAN_TCI were already allowed on NXAST_REG_MOVE,
but not on NXAST_REG_LOAD. This makes them valid on both.
Requested-by: Pankaj Thakkar <thakkar@nicira.com>
Diffstat (limited to 'include/openflow')
| -rw-r--r-- | include/openflow/nicira-ext.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h index 0b01aaadf..5013a5a00 100644 --- a/include/openflow/nicira-ext.h +++ b/include/openflow/nicira-ext.h @@ -430,9 +430,9 @@ OFP_ASSERT(sizeof(struct nx_action_reg_move) == 24); * starts at 0 for the least-significant bit, 1 for the next most significant * bit, and so on. * - * 'dst' is an nxm_header with nxm_hasmask=0. It must be one of the following: - * - * - NXM_NX_REG(idx) for idx in the switch's accepted range. + * 'dst' is an nxm_header with nxm_hasmask=0. See the documentation for + * NXAST_REG_MOVE, above, for the permitted fields and for the side effects of + * loading them. * * The 'ofs' and 'n_bits' fields are combined into a single 'ofs_nbits' field * to avoid enlarging the structure by another 8 bytes. To allow 'n_bits' to |