mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

Merge "master" into "next".

Browse Source
This commit is contained in:
Ben Pfaff
2010-02-24 13:47:09 -08:00
parent ed951f1577 efa6c663df
commit 02dd3123a0
30 changed files with 326 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/dpif-netdev.c
View File

@@ -22,8 +22,8 @@
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
#include <net/if.h>
#include <netinet/in.h>
#include <net/if.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
@@ -751,7 +751,7 @@ dpif_netdev_validate_actions(const union odp_action *actions, int n_actions,
case ODPAT_SET_VLAN_PCP:
*mutates = true;
if (a->vlan_pcp.vlan_pcp & ~VLAN_PCP_MASK) {
if (a->vlan_pcp.vlan_pcp & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT)) {
return EINVAL;
}
break;
@@ -1290,8 +1290,9 @@ dp_netdev_execute_actions(struct dp_netdev *dp,
break;
case ODPAT_SET_VLAN_PCP:
dp_netdev_modify_vlan_tci(packet, key, a->vlan_pcp.vlan_pcp << 13,
VLAN_PCP_MASK);
dp_netdev_modify_vlan_tci(
packet, key, a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT,
VLAN_PCP_MASK);
break;
case ODPAT_STRIP_VLAN: