patch-2.4.0-test9 linux/include/net/ip_fib.h

Next file: linux/include/net/ipv6.h
Previous file: linux/include/net/ip6_route.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
@@ -140,19 +140,19 @@
 extern struct fib_table *local_table;
 extern struct fib_table *main_table;
 
-extern __inline__ struct fib_table *fib_get_table(int id)
+static inline struct fib_table *fib_get_table(int id)
 {
 	if (id != RT_TABLE_LOCAL)
 		return main_table;
 	return local_table;
 }
 
-extern __inline__ struct fib_table *fib_new_table(int id)
+static inline struct fib_table *fib_new_table(int id)
 {
 	return fib_get_table(id);
 }
 
-extern __inline__ int fib_lookup(const struct rt_key *key, struct fib_result *res)
+static inline int fib_lookup(const struct rt_key *key, struct fib_result *res)
 {
 	if (local_table->tb_lookup(local_table, key, res) &&
 	    main_table->tb_lookup(main_table, key, res))
@@ -160,7 +160,7 @@
 	return 0;
 }
 
-extern __inline__ void fib_select_default(const struct rt_key *key, struct fib_result *res)
+static inline void fib_select_default(const struct rt_key *key, struct fib_result *res)
 {
 	if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
 		main_table->tb_select_default(main_table, key, res);
@@ -175,7 +175,7 @@
 extern struct fib_table *__fib_new_table(int id);
 extern void fib_rule_put(struct fib_rule *r);
 
-extern __inline__ struct fib_table *fib_get_table(int id)
+static inline struct fib_table *fib_get_table(int id)
 {
 	if (id == 0)
 		id = RT_TABLE_MAIN;
@@ -183,7 +183,7 @@
 	return fib_tables[id];
 }
 
-extern __inline__ struct fib_table *fib_new_table(int id)
+static inline struct fib_table *fib_new_table(int id)
 {
 	if (id == 0)
 		id = RT_TABLE_MAIN;
@@ -241,7 +241,7 @@
 extern void fib_rules_init(void);
 #endif
 
-extern __inline__ void fib_combine_itag(u32 *itag, struct fib_result *res)
+static inline void fib_combine_itag(u32 *itag, struct fib_result *res)
 {
 #ifdef CONFIG_NET_CLS_ROUTE
 #ifdef CONFIG_IP_MULTIPLE_TABLES
@@ -259,13 +259,13 @@
 
 extern void free_fib_info(struct fib_info *fi);
 
-extern __inline__ void fib_info_put(struct fib_info *fi)
+static inline void fib_info_put(struct fib_info *fi)
 {
 	if (atomic_dec_and_test(&fi->fib_clntref))
 		free_fib_info(fi);
 }
 
-extern __inline__ void fib_res_put(struct fib_result *res)
+static inline void fib_res_put(struct fib_result *res)
 {
 	if (res->fi)
 		fib_info_put(res->fi);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)