datapath: Reformat copyright messages.

[sliver-openvswitch.git] / datapath / tunnel.h

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index f80df99..e98b789 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -1,9 +1,19 @@
 /*
- * Copyright (c) 2010, 2011 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2011 Nicira Networks.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
 #ifndef TUNNEL_H
@@ -35,8 +45,10 @@
 #define TNL_T_KEY_MATCH                (1 << 11)
 
 /* Private flags not exposed to userspace in this form. */
-#define TNL_F_IN_KEY_MATCH      (1 << 16) /* Store the key in tun_id to match in flow table. */
-#define TNL_F_OUT_KEY_ACTION   (1 << 17) /* Get the key from a SET_TUNNEL action. */
+#define TNL_F_IN_KEY_MATCH     (1 << 16) /* Store the key in tun_id to
+                                          * match in flow table. */
+#define TNL_F_OUT_KEY_ACTION   (1 << 17) /* Get the key from a SET_TUNNEL
+                                          * action. */
 
 /* All public tunnel flags. */
 #define TNL_F_PUBLIC (TNL_F_CSUM | TNL_F_TOS_INHERIT | TNL_F_TTL_INHERIT | \
@@ -57,7 +69,7 @@ struct port_lookup_key {
        u32    tunnel_type;
 };
 
-#define PORT_KEY_LEN   (offsetof(struct port_lookup_key, tunnel_type) + \
+#define PORT_KEY_LEN   (offsetof(struct port_lookup_key, tunnel_type) + \
                         FIELD_SIZEOF(struct port_lookup_key, tunnel_type))
 
 /**
@@ -153,7 +165,8 @@ struct tnl_cache {
        int len;                /* Length of data to be memcpy'd from cache. */
        int hh_len;             /* Hardware hdr length, cached from hh_cache. */
 
-       /* Sequence number of mutable->seq from which this cache was generated. */
+       /* Sequence number of mutable->seq from which this cache was
+        * generated. */
        unsigned mutable_seq;
 
 #ifdef HAVE_HH_SEQ
@@ -216,7 +229,7 @@ struct tnl_vport {
        atomic_t frag_id;
 
        spinlock_t cache_lock;
-       struct tnl_cache __rcu *cache;          /* Protected by RCU/cache_lock. */
+       struct tnl_cache __rcu *cache;  /* Protected by RCU/cache_lock. */
 
 #ifdef NEED_CACHE_TIMEOUT
        /*