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

• Lines: 79
• Date: Sun Sep 17 10:03:43 2000
• Orig file: v2.4.0-test8/linux/include/net/addrconf.h
• Orig date: Mon Aug 23 10:01:02 1999

diff -u --recursive --new-file v2.4.0-test8/linux/include/net/addrconf.h linux/include/net/addrconf.h
@@ -87,7 +87,7 @@
 extern void			addrconf_prefix_rcv(struct net_device *dev,
 						    u8 *opt, int len);
 
-extern __inline__ struct inet6_dev *
+static inline struct inet6_dev *
 __in6_dev_get(struct net_device *dev)
 {
 	return (struct inet6_dev *)dev->ip6_ptr;
@@ -95,7 +95,7 @@
 
 extern rwlock_t addrconf_lock;
 
-extern __inline__ struct inet6_dev *
+static inline struct inet6_dev *
 in6_dev_get(struct net_device *dev)
 {
 	struct inet6_dev *idev = NULL;
@@ -109,7 +109,7 @@
 
 extern void in6_dev_finish_destroy(struct inet6_dev *idev);
 
-extern __inline__ void
+static inline void
 in6_dev_put(struct inet6_dev *idev)
 {
 	if (atomic_dec_and_test(&idev->refcnt))
@@ -122,7 +122,7 @@
 
 extern void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp);
 
-extern __inline__ void in6_ifa_put(struct inet6_ifaddr *ifp)
+static inline void in6_ifa_put(struct inet6_ifaddr *ifp)
 {
 	if (atomic_dec_and_test(&ifp->refcnt))
 		inet6_ifa_finish_destroy(ifp);
@@ -157,7 +157,7 @@
  *	compute link-local solicited-node multicast address
  */
 
-extern __inline__ void addrconf_addr_solict_mult_old(struct in6_addr *addr,
+static inline void addrconf_addr_solict_mult_old(struct in6_addr *addr,
 						     struct in6_addr *solicited)
 {
 	ipv6_addr_set(solicited,
@@ -165,7 +165,7 @@
 		      __constant_htonl(0x1), addr->s6_addr32[3]);
 }
 
-extern __inline__ void addrconf_addr_solict_mult_new(struct in6_addr *addr,
+static inline void addrconf_addr_solict_mult_new(struct in6_addr *addr,
 						     struct in6_addr *solicited)
 {
 	ipv6_addr_set(solicited,
@@ -175,21 +175,21 @@
 }
 
 
-extern __inline__ void ipv6_addr_all_nodes(struct in6_addr *addr)
+static inline void ipv6_addr_all_nodes(struct in6_addr *addr)
 {
 	ipv6_addr_set(addr,
 		      __constant_htonl(0xFF020000), 0, 0,
 		      __constant_htonl(0x1));
 }
 
-extern __inline__ void ipv6_addr_all_routers(struct in6_addr *addr)
+static inline void ipv6_addr_all_routers(struct in6_addr *addr)
 {
 	ipv6_addr_set(addr,
 		      __constant_htonl(0xFF020000), 0, 0,
 		      __constant_htonl(0x2));
 }
 
-extern __inline__ int ipv6_addr_is_multicast(struct in6_addr *addr)
+static inline int ipv6_addr_is_multicast(struct in6_addr *addr)
 {
 	return (addr->s6_addr32[0] & __constant_htonl(0xFF000000)) == __constant_htonl(0xFF000000);
 }