meta-flow: Correctly set destination MAC in mf_set_flow_value().

[sliver-openvswitch.git] / ovsdb / mutation.c

diff --git a/ovsdb/mutation.c b/ovsdb/mutation.c
index bd6986d..7ae83fe 100644 (file)
--- a/ovsdb/mutation.c
+++ b/ovsdb/mutation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011 Nicira Networks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -310,7 +310,7 @@ mutate_scalar(const struct ovsdb_type *dst_type, struct ovsdb_datum *dst,
         }
     }
 
-    error = ovsdb_datum_sort(dst, dst_type);
+    error = ovsdb_datum_sort(dst, dst_type->key.type);
     if (error) {
         ovsdb_error_destroy(error);
         return ovsdb_error("constraint violation",
@@ -327,7 +327,7 @@ ovsdb_mutation_check_count(struct ovsdb_datum *dst,
     if (!ovsdb_datum_conforms_to_type(dst, dst_type)) {
         char *s = ovsdb_type_to_english(dst_type);
         struct ovsdb_error *e = ovsdb_error(
-            "constaint violation",
+            "constraint violation",
             "Attempted to store %u elements in %s.", dst->n, s);
         free(s);
         return e;
@@ -379,6 +379,9 @@ ovsdb_mutation_set_execute(struct ovsdb_row *row,
             ovsdb_datum_subtract(dst, dst_type, arg, arg_type);
             error = ovsdb_mutation_check_count(dst, dst_type);
             break;
+
+        default:
+            NOT_REACHED();
         }
         if (error) {
             return error;