merge with upstream

[mirror_frr.git] / zebra / zebra_ns.h

diff --git a/zebra/zebra_ns.h b/zebra/zebra_ns.h
index c50f9249d2fc344b0a6ef6eb9aed72e317590a91..6cfba93e50ae66f8ecdccc6468acf7a03011ef89 100644 (file)
--- a/zebra/zebra_ns.h
+++ b/zebra/zebra_ns.h
@@ -15,10 +15,9 @@
  * 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 Quagga; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #if !defined(__ZEBRA_NS_H__)
 #define __ZEBRA_NS_H__
@@ -27,42 +26,40 @@
 
 #ifdef HAVE_NETLINK
 /* Socket interface to kernel */
-struct nlsock
-{
-  int sock;
-  int seq;
-  struct sockaddr_nl snl;
-  char name[64];
+struct nlsock {
+       int sock;
+       int seq;
+       struct sockaddr_nl snl;
+       char name[64];
 };
 #endif
 
-struct zebra_ns
-{
-  /* net-ns name.  */
-  char name[VRF_NAMSIZ];
+struct zebra_ns {
+       /* net-ns name.  */
+       char name[VRF_NAMSIZ];
 
-  /* Identifier. */
-  ns_id_t ns_id;
+       /* Identifier. */
+       ns_id_t ns_id;
 
 #ifdef HAVE_NETLINK
-  struct nlsock netlink;     /* kernel messages */
-  struct nlsock netlink_cmd; /* command channel */
-  struct thread *t_netlink;
+       struct nlsock netlink;     /* kernel messages */
+       struct nlsock netlink_cmd; /* command channel */
+       struct thread *t_netlink;
 #endif
 
-  struct route_table *if_table;
+       struct route_table *if_table;
 
-#if defined (HAVE_RTADV)
-  struct rtadv rtadv;
+#if defined(HAVE_RTADV)
+       struct rtadv rtadv;
 #endif /* HAVE_RTADV */
 };
 
 #define NS_DEFAULT 0
 #define NS_UNKNOWN UINT16_MAX
 
-struct zebra_ns *zebra_ns_lookup (ns_id_t ns_id);
+struct zebra_ns *zebra_ns_lookup(ns_id_t ns_id);
 
-int zebra_ns_init (void);
-int zebra_ns_enable (ns_id_t ns_id, void **info);
-int zebra_ns_disable (ns_id_t ns_id, void **info);
+int zebra_ns_init(void);
+int zebra_ns_enable(ns_id_t ns_id, void **info);
+int zebra_ns_disable(ns_id_t ns_id, void **info);
 #endif