--- batman-adv_master.batman_adv.h 2020-11-10 00:05:01.123774276 +0100 +++ alfred_master.batman_adv.h 2020-11-10 00:05:01.135774408 +0100 @@ -675,30 +675,4 @@ BATADV_TP_REASON_TOO_MANY = 133, };
-/** - * enum batadv_ifla_attrs - batman-adv ifla nested attributes - */ -enum batadv_ifla_attrs { - /** - * @IFLA_BATADV_UNSPEC: unspecified attribute which is not parsed by - * rtnetlink - */ - IFLA_BATADV_UNSPEC, - - /** - * @IFLA_BATADV_ALGO_NAME: routing algorithm (name) which should be - * used by the newly registered batadv net_device. - */ - IFLA_BATADV_ALGO_NAME, - - /* add attributes above here, update the policy in soft-interface.c */ - - /** - * @__IFLA_BATADV_MAX: internal use - */ - __IFLA_BATADV_MAX, -}; - -#define IFLA_BATADV_MAX (__IFLA_BATADV_MAX - 1) - #endif /* _UAPI_LINUX_BATMAN_ADV_H_ */
linux-merge@lists.open-mesh.org