clean code for alternate route in FIB

Author: akemery

include/net/nexthop.h

@@ -85,17 +85,12 @@ struct nexthop {
 	struct net		*net;
 
 	u32			id;
-
+	u32			back_id;
 	u8			protocol;   /* app managing this nh */
 	u8			nh_flags;
 	bool			is_group;
-	bool			has_back;
 	bool			is_back;
 	bool			is_prin;
-	u32			prin_id;
-	u32			back_id;
-	struct nexthop 		*nh_prin;
-	struct nexthop		*nh_back;
 	refcount_t		refcnt;
 	struct rcu_head		rcu;
 
@@ -105,7 +100,6 @@ struct nexthop {
 	};
 
 	struct nh_info	__rcu *nh_info_back;
-	struct nh_info	__rcu *nh_info_prin;
 };
 
 /* caller is holding rcu or rtnl; no reference taken to nexthop */

include/uapi/linux/netlink.h

@@ -69,6 +69,7 @@ struct nlmsghdr {
 #define NLM_F_EXCL	0x200	/* Do not touch, if it exists	*/
 #define NLM_F_CREATE	0x400	/* Create, if it does not exist	*/
 #define NLM_F_APPEND	0x800	/* Add to end of list		*/
+#define NLM_F_ALTROUTE 0x1000	/* Add alternate route		*/
 
 /* Modifiers to DELETE request */
 #define NLM_F_NONREC	0x100	/* Do not delete recursively	*/

include/uapi/linux/rtnetlink.h

@@ -180,11 +180,6 @@ enum {
 	RTM_GETVLAN,
 #define RTM_GETVLAN	RTM_GETVLAN
 
-//	RTM_ALTROUTE	= 116,
-//#define RTM_ALTROUTE	RTM_ALTROUTE
-
-
-
 	__RTM_MAX,
 #define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -406,7 +401,7 @@ struct rtnexthop {
 #define RTNH_F_LINKDOWN		16	/* carrier-down on nexthop */
 #define RTNH_F_UNRESOLVED	32	/* The entry is unresolved (ipmr) */
 #define RTNH_F_BACK_LINK	64	/*Nexthop group has a backup link*/
-#define RTNH_F_DUMMY		128	/*Dummy nexthop*/
+
 
 #define RTNH_COMPARE_MASK	(RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD)