From 1b769b08c195f7d95525131f65e5794c3c09a335 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 1 Mar 1999 20:13:54 +0000
Subject: [PATCH] Renamed struct rtattr to struct rta to make things more
 consistent and avoid namespace clashes with <linux/rtnetlink.h>. Other files
 should not be affected since they use 'rta' directly.

---
 nest/protocol.h |  4 ++--
 nest/route.h    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nest/protocol.h b/nest/protocol.h
index 8a27350c..9463861e 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -15,7 +15,7 @@
 struct iface;
 struct rte;
 struct neighbor;
-struct rtattr;
+struct rta;
 struct network;
 struct proto_config;
 struct config;
@@ -91,7 +91,7 @@ struct proto {
   void (*rt_notify)(struct proto *, struct network *net, struct rte *new, struct rte *old);
   void (*neigh_notify)(struct neighbor *neigh);
 
-  int (*rta_same)(struct rtattr *, struct rtattr *);
+  int (*rta_same)(struct rta *, struct rta *);
   int (*rte_better)(struct rte *, struct rte *);
   void (*rte_insert)(struct network *, struct rte *);
   void (*rte_remove)(struct network *, struct rte *);
diff --git a/nest/route.h b/nest/route.h
index 916a704b..243dcfac 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -117,7 +117,7 @@ typedef struct network {
 typedef struct rte {
   struct rte *next;
   net *net;				/* Network this RTE belongs to */
-  struct rtattr *attrs;			/* Attributes of this route */
+  struct rta *attrs;			/* Attributes of this route */
   byte flags;				/* Flags (REF_...) */
   byte pflags;				/* Protocol-specific flags */
   word pref;				/* Route preference */
@@ -152,7 +152,7 @@ void rt_setup(rtable *, char *);
 net *net_find(rtable *tab, unsigned tos, ip_addr addr, unsigned len);
 net *net_get(rtable *tab, unsigned tos, ip_addr addr, unsigned len);
 rte *rte_find(net *net, struct proto *p);
-rte *rte_get_temp(struct rtattr *);
+rte *rte_get_temp(struct rta *);
 void rte_update(net *net, struct proto *p, rte *new);
 void rte_discard(rte *old);
 void rte_dump(rte *);
@@ -170,9 +170,9 @@ void rt_prune(rtable *tab);
  *	construction of BGP route attribute lists.
  */
 
-typedef struct rtattr {
-  struct rtattr *next, *prev;		/* Hash chain */
-  struct rtattr *garbage;		/* Garbage collector chain */
+typedef struct rta {
+  struct rta *next, *prev;		/* Hash chain */
+  struct rta *garbage;			/* Garbage collector chain */
   struct proto *proto;			/* Protocol instance */
   unsigned uc;				/* Use count */
   byte source;				/* Route source (RTS_...) */