Merge branch 'master' into forward-port

[sliver-openvswitch.git] / lib / tag.h

diff --git a/lib/tag.h b/lib/tag.h
index 2002e5a..2050de0 100644 (file)
--- a/lib/tag.h
+++ b/lib/tag.h
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2011 Nicira, Inc.
  *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #ifndef TAG_H
@@ -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);