mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

dpif-netdev: Clarify function to modify VLAN TCI field

Browse Source
This commit is contained in:
Justin Pettit
2010-02-20 19:50:14 -08:00
parent bfc96d9b50
commit 2a910c50fa
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dpif-netdev.c
View File

@@ -1080,6 +1080,15 @@ dp_netdev_wait(void)
} }
} }
/* Modify the TCI field of 'packet'. If a VLAN tag is not present, one
* is added with the TCI field set to 'tci'. If a VLAN tag is present,
* then 'mask' bits are cleared before 'tci' is logically OR'd into the
* TCI field.
*
* Note that the function does not ensure that 'tci' does not affect
* bits outside of 'mask'.
*/
static void static void
dp_netdev_modify_vlan_tci(struct ofpbuf *packet, flow_t *key, dp_netdev_modify_vlan_tci(struct ofpbuf *packet, flow_t *key,
uint16_t tci, uint16_t mask) uint16_t tci, uint16_t mask)
@@ -1087,7 +1096,7 @@ dp_netdev_modify_vlan_tci(struct ofpbuf *packet, flow_t *key,
struct vlan_eth_header *veh; struct vlan_eth_header *veh;
if (key->dl_vlan != htons(ODP_VLAN_NONE)) { if (key->dl_vlan != htons(ODP_VLAN_NONE)) {
/* Modify 'mask' bits, but maintain other TCI bits. */ /* Clear 'mask' bits, but maintain other TCI bits. */
veh = packet->l2; veh = packet->l2;
veh->veth_tci &= ~htons(mask); veh->veth_tci &= ~htons(mask);
veh->veth_tci |= htons(tci); veh->veth_tci |= htons(tci);