Fix a couple of problems when modifying VLAN tags.

diff --git a/switch/datapath.c b/switch/datapath.c
index aa1cb802d26e6e2b3d02fc1e77fe26b85125620e..12bb714469954605db10068eb4b8c2ebd5a90055 100644 (file)
--- a/switch/datapath.c
+++ b/switch/datapath.c
@@ -952,12 +952,12 @@ modify_vlan(struct buffer *buffer,
     uint16_t new_id = a->arg.vlan_id;
     struct vlan_eth_header *veh;
 
-    if (new_id != OFP_VLAN_NONE) {
+    if (new_id != htons(OFP_VLAN_NONE)) {
         if (key->flow.dl_vlan != htons(OFP_VLAN_NONE)) {
             /* Modify vlan id, but maintain other TCI values */
             veh = buffer->l2;
             veh->veth_tci &= ~htons(VLAN_VID);
-            veh->veth_tci |= htons(new_id);
+            veh->veth_tci |= new_id;
         } else {
             /* Insert new vlan id. */
             struct eth_header *eh = buffer->l2;