Global replace of Nicira Networks.

[cascardo/ovs.git] / lib / tag.h

diff --git a/lib/tag.h b/lib/tag.h
index f645dc9..2050de0 100644 (file)
--- a/lib/tag.h
+++ b/lib/tag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@ static inline bool tag_intersects(tag_type, tag_type);
 static inline bool tag_is_valid(tag_type);
 
 /* Returns true if 'a' and 'b' have at least one tag in common,
- * false if their set of tags is disjoint. . */
+ * false if their set of tags is disjoint. */
 static inline bool
 tag_intersects(tag_type a, tag_type b)
 {
@@ -107,6 +107,7 @@ struct tag_set {
 
 void tag_set_init(struct tag_set *);
 void tag_set_add(struct tag_set *, tag_type);
+void tag_set_union(struct tag_set *, const struct tag_set *);
 static inline bool tag_set_is_empty(const struct tag_set *);
 static inline bool tag_set_intersects(const struct tag_set *, tag_type);