diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-24 13:47:09 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-24 13:47:09 -0800 |
| commit | 02dd3123a0e312f1d33403e744af52dd6096f12d (patch) | |
| tree | 6e98abcf84cf291f6c9d6ef06959a4e6aa5393f5 /datapath/actions.c | |
| parent | ed951f15779df008e43012d99cdb51f3c5a57229 (diff) | |
| parent | efa6c663df0bcad748e3a89d7b3f4dec187f6f53 (diff) | |
Merge "master" into "next".
Diffstat (limited to 'datapath/actions.c')
| -rw-r--r-- | datapath/actions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/datapath/actions.c b/datapath/actions.c index ab392222..b39d8307 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -93,7 +93,7 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, mask = VLAN_VID_MASK; key->dl_vlan = htons(tci & mask); } else { - tci = a->vlan_pcp.vlan_pcp << 13; + tci = a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT; mask = VLAN_PCP_MASK; } |