allow pfinet to link using -O0

This fixes a long list of undefined references when compiling with -O0
by using static instead of extern in header files.

36 files changed, 213 insertions, 230 deletions

diff --git a/pfinet/linux-src/include/asm-i386/checksum.h b/pfinet/linux-src/include/asm-i386/checksum.h
index add89590..266033a8 100644
--- a/pfinet/linux-src/include/asm-i386/checksum.h
+++ b/pfinet/linux-src/include/asm-i386/checksum.h
@@ -34,14 +34,14 @@ asmlinkage unsigned int csum_partial_copy_generic( const char *src, char *dst, i
  *	If you use these functions directly please don't forget the 
  *	verify_area().
  */
-extern __inline__
+static __inline__
 unsigned int csum_partial_copy_nocheck ( const char *src, char *dst,
 					int len, int sum)
 {
 	return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
 }
 
-extern __inline__
+static __inline__
 unsigned int csum_partial_copy_from_user ( const char *src, char *dst,
 						int len, int sum, int *err_ptr)
 {
@@ -58,7 +58,7 @@ unsigned int csum_partial_copy_from_user ( const char *src, char *dst,
  * This combination is currently not used, but possible:
  */
 
-extern __inline__
+static __inline__
 unsigned int csum_partial_copy_to_user ( const char *src, char *dst,
 					int len, int sum, int *err_ptr)
 {
diff --git a/pfinet/linux-src/include/linux/atalk.h b/pfinet/linux-src/include/linux/atalk.h
index e9d20979..491585a7 100644
--- a/pfinet/linux-src/include/linux/atalk.h
+++ b/pfinet/linux-src/include/linux/atalk.h
@@ -161,7 +161,7 @@ extern void aarp_proto_init(void);
  *	Give a device find its atif control structure
  */
 
-extern __inline__ struct atalk_iface *atalk_find_dev(struct device *dev)
+static __inline__ struct atalk_iface *atalk_find_dev(struct device *dev)
 {
 	return dev->atalk_ptr;
 }
diff --git a/pfinet/linux-src/include/linux/bitops.h b/pfinet/linux-src/include/linux/bitops.h
index ddb84dd6..646edc42 100644
--- a/pfinet/linux-src/include/linux/bitops.h
+++ b/pfinet/linux-src/include/linux/bitops.h
@@ -8,7 +8,7 @@
  * differs in spirit from the above ffz (man ffs).
  */
 
-extern __inline__ int generic_ffs(int x)
+static __inline__ int generic_ffs(int x)
 {
 	int r = 1;
 
@@ -42,7 +42,7 @@ extern __inline__ int generic_ffs(int x)
  * of bits set) of a N-bit word
  */
 
-extern __inline__ unsigned int generic_hweight32(unsigned int w)
+static __inline__ unsigned int generic_hweight32(unsigned int w)
 {
         unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555);
         res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
@@ -51,7 +51,7 @@ extern __inline__ unsigned int generic_hweight32(unsigned int w)
         return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF);
 }
 
-extern __inline__ unsigned int generic_hweight16(unsigned int w)
+static __inline__ unsigned int generic_hweight16(unsigned int w)
 {
         unsigned int res = (w & 0x5555) + ((w >> 1) & 0x5555);
         res = (res & 0x3333) + ((res >> 2) & 0x3333);
@@ -59,7 +59,7 @@ extern __inline__ unsigned int generic_hweight16(unsigned int w)
         return (res & 0x00FF) + ((res >> 8) & 0x00FF);
 }
 
-extern __inline__ unsigned int generic_hweight8(unsigned int w)
+static __inline__ unsigned int generic_hweight8(unsigned int w)
 {
         unsigned int res = (w & 0x55) + ((w >> 1) & 0x55);
         res = (res & 0x33) + ((res >> 2) & 0x33);
diff --git a/pfinet/linux-src/include/linux/filter.h b/pfinet/linux-src/include/linux/filter.h
index 58ad8b1b..4978919f 100644
--- a/pfinet/linux-src/include/linux/filter.h
+++ b/pfinet/linux-src/include/linux/filter.h
@@ -38,7 +38,7 @@ struct sk_filter
         struct sock_filter     	insns[0];
 };
 
-extern __inline__ unsigned int sk_filter_len(struct sk_filter *fp)
+static __inline__ unsigned int sk_filter_len(struct sk_filter *fp)
 {
 	return fp->len*sizeof(struct sock_filter) + sizeof(*fp);
 }
diff --git a/pfinet/linux-src/include/linux/firewall.h b/pfinet/linux-src/include/linux/firewall.h
index 1747f381..460fa81d 100644
--- a/pfinet/linux-src/include/linux/firewall.h
+++ b/pfinet/linux-src/include/linux/firewall.h
@@ -41,17 +41,17 @@ extern int call_fw_firewall(int pf, struct device *dev, void *phdr, void *arg, s
 extern int call_in_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **pskb);
 extern int call_out_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **pskb);
 #else
-extern __inline__ int call_fw_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **skb)
+static __inline__ int call_fw_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **skb)
 {
 	return FW_ACCEPT;
 }
 
-extern __inline__ int call_in_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **skb)
+static __inline__ int call_in_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **skb)
 {
 	return FW_ACCEPT;
 }
 
-extern __inline__ int call_out_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **skb)
+static __inline__ int call_out_firewall(int pf, struct device *dev, void *phdr, void *arg, struct sk_buff **skb)
 {
 	return FW_ACCEPT;
 }
diff --git a/pfinet/linux-src/include/linux/hfs_fs.h b/pfinet/linux-src/include/linux/hfs_fs.h
index 851bcb0d..04241f71 100644
--- a/pfinet/linux-src/include/linux/hfs_fs.h
+++ b/pfinet/linux-src/include/linux/hfs_fs.h
@@ -319,12 +319,12 @@ extern void hfs_tolower(unsigned char *, int);
 #define	HFS_I(X)	(&((X)->u.hfs_i))
 #define	HFS_SB(X)	(&((X)->u.hfs_sb))
 
-extern __inline__ void hfs_nameout(struct inode *dir, struct hfs_name *out,
+static __inline__ void hfs_nameout(struct inode *dir, struct hfs_name *out,
 				   const char *in, int len) {
 	HFS_SB(dir->i_sb)->s_nameout(out, in, len);
 }
 
-extern __inline__ int hfs_namein(struct inode *dir, char *out,
+static __inline__ int hfs_namein(struct inode *dir, char *out,
 				 const struct hfs_name *in) {
 	int len = HFS_SB(dir->i_sb)->s_namein(out, in);
 	if (HFS_SB(dir->i_sb)->s_lowercase) {
diff --git a/pfinet/linux-src/include/linux/igmp.h b/pfinet/linux-src/include/linux/igmp.h
index c13afde2..578ab98e 100644
--- a/pfinet/linux-src/include/linux/igmp.h
+++ b/pfinet/linux-src/include/linux/igmp.h
@@ -101,7 +101,7 @@ struct ip_mc_list
 	char			loaded;
 };
 
-extern __inline__ int ip_check_mc(struct device *dev, u32 mc_addr)
+static __inline__ int ip_check_mc(struct device *dev, u32 mc_addr)
 {
 	struct in_device *in_dev = dev->ip_ptr;
 	struct ip_mc_list *im;
diff --git a/pfinet/linux-src/include/linux/inetdevice.h b/pfinet/linux-src/include/linux/inetdevice.h
index 323a305c..c9570452 100644
--- a/pfinet/linux-src/include/linux/inetdevice.h
+++ b/pfinet/linux-src/include/linux/inetdevice.h
@@ -80,7 +80,7 @@ extern u32		inet_select_addr(struct device *dev, u32 dst, int scope);
 extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, u32 prefix, u32 mask);
 extern void		inet_forward_change(void);
 
-extern __inline__ int inet_ifa_match(u32 addr, struct in_ifaddr *ifa)
+static __inline__ int inet_ifa_match(u32 addr, struct in_ifaddr *ifa)
 {
 	return !((addr^ifa->ifa_address)&ifa->ifa_mask);
 }
@@ -89,7 +89,7 @@ extern __inline__ int inet_ifa_match(u32 addr, struct in_ifaddr *ifa)
  *	Check if a mask is acceptable.
  */
  
-extern __inline__ int bad_mask(u32 mask, u32 addr)
+static __inline__ int bad_mask(u32 mask, u32 addr)
 {
 	if (addr & (mask = ~mask))
 		return 1;
@@ -110,14 +110,14 @@ extern __inline__ int bad_mask(u32 mask, u32 addr)
 
 #endif /* __KERNEL__ */
 
-extern __inline__ __u32 inet_make_mask(int logmask)
+static __inline__ __u32 inet_make_mask(int logmask)
 {
 	if (logmask)
 		return htonl(~((1<<(32-logmask))-1));
 	return 0;
 }
 
-extern __inline__ int inet_mask_len(__u32 mask)
+static __inline__ int inet_mask_len(__u32 mask)
 {
 	if (!(mask = ntohl(mask)))
 		return 0;
diff --git a/pfinet/linux-src/include/linux/ipsec.h b/pfinet/linux-src/include/linux/ipsec.h
index b9d7bcc6..2ccf61d0 100644
--- a/pfinet/linux-src/include/linux/ipsec.h
+++ b/pfinet/linux-src/include/linux/ipsec.h
@@ -49,7 +49,7 @@
  */
  
 #ifdef CONFIG_NET_SECURITY
-extern __inline__ int ipsec_sk_policy(struct sock *sk, struct sk_buff *skb)
+static __inline__ int ipsec_sk_policy(struct sock *sk, struct sk_buff *skb)
 {
 	return ((sk->authentication < IPSEC_LEVEL_REQUIRE) ||
 		(skb->security & RCV_AUTH)) &&
@@ -59,7 +59,7 @@ extern __inline__ int ipsec_sk_policy(struct sock *sk, struct sk_buff *skb)
 
 #else
 
-extern __inline__ int ipsec_sk_policy(struct sock *sk, struct sk_buff *skb)
+static __inline__ int ipsec_sk_policy(struct sock *sk, struct sk_buff *skb)
 {
 	return 1;
 }
diff --git a/pfinet/linux-src/include/linux/netdevice.h b/pfinet/linux-src/include/linux/netdevice.h
index 0b6af203..6ca7312e 100644
--- a/pfinet/linux-src/include/linux/netdevice.h
+++ b/pfinet/linux-src/include/linux/netdevice.h
@@ -362,7 +362,7 @@ extern int		dev_restart(struct device *dev);
 
 typedef int gifconf_func_t(struct device * dev, char * bufptr, int len);
 extern int		register_gifconf(unsigned int family, gifconf_func_t * gifconf);
-extern __inline__ int unregister_gifconf(unsigned int family)
+static __inline__ int unregister_gifconf(unsigned int family)
 {
 	return register_gifconf(family, 0);
 }
@@ -388,12 +388,12 @@ extern atomic_t		dev_lockct;
  *	but they may do soon. Do it properly anyway.
  */
 
-extern __inline__ void  dev_lock_list(void)
+static __inline__ void  dev_lock_list(void)
 {
 	atomic_inc(&dev_lockct);
 }
 
-extern __inline__ void  dev_unlock_list(void)
+static __inline__ void  dev_unlock_list(void)
 {
 	atomic_dec(&dev_lockct);
 }
@@ -409,7 +409,7 @@ extern __inline__ void  dev_unlock_list(void)
  *		is not atomic.
  */
 
-extern __inline__ void dev_lock_wait(void)
+static __inline__ void dev_lock_wait(void)
 {
 	while (atomic_read(&dev_lockct)) {
 		current->policy |= SCHED_YIELD;
@@ -417,7 +417,7 @@ extern __inline__ void dev_lock_wait(void)
 	}
 }
 
-extern __inline__ void dev_init_buffers(struct device *dev)
+static __inline__ void dev_init_buffers(struct device *dev)
 {
 	/* DO NOTHING */
 }
diff --git a/pfinet/linux-src/include/linux/netlink.h b/pfinet/linux-src/include/linux/netlink.h
index 59075b07..e2525ce4 100644
--- a/pfinet/linux-src/include/linux/netlink.h
+++ b/pfinet/linux-src/include/linux/netlink.h
@@ -126,7 +126,7 @@ struct netlink_callback
 	long		args[4];
 };
 
-extern __inline__ struct nlmsghdr *
+static __inline__ struct nlmsghdr *
 __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len)
 {
 	struct nlmsghdr *nlh;
diff --git a/pfinet/linux-src/include/linux/notifier.h b/pfinet/linux-src/include/linux/notifier.h
index 1e8bf707..633f61a2 100644
--- a/pfinet/linux-src/include/linux/notifier.h
+++ b/pfinet/linux-src/include/linux/notifier.h
@@ -26,7 +26,7 @@ struct notifier_block
 #define NOTIFY_STOP_MASK	0x8000		/* Don't call further */
 #define NOTIFY_BAD		(NOTIFY_STOP_MASK|0x0002)	/* Bad/Veto action	*/
 
-extern __inline__ int notifier_chain_register(struct notifier_block **list, struct notifier_block *n)
+static __inline__ int notifier_chain_register(struct notifier_block **list, struct notifier_block *n)
 {
 	while(*list)
 	{
@@ -44,7 +44,7 @@ extern __inline__ int notifier_chain_register(struct notifier_block **list, stru
  *	GPL'd
  */
  
-extern __inline__ int notifier_chain_unregister(struct notifier_block **nl, struct notifier_block *n)
+static __inline__ int notifier_chain_unregister(struct notifier_block **nl, struct notifier_block *n)
 {
 	while((*nl)!=NULL)
 	{
@@ -62,7 +62,7 @@ extern __inline__ int notifier_chain_unregister(struct notifier_block **nl, stru
  *	This is one of these things that is generally shorter inline
  */
  
-extern __inline__ int notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
+static __inline__ int notifier_call_chain(struct notifier_block **n, unsigned long val, void *v)
 {
 	int ret=NOTIFY_DONE;
 	struct notifier_block *nb = *n;
diff --git a/pfinet/linux-src/include/linux/parport.h b/pfinet/linux-src/include/linux/parport.h
index 856fc016..3712ce16 100644
--- a/pfinet/linux-src/include/linux/parport.h
+++ b/pfinet/linux-src/include/linux/parport.h
@@ -277,7 +277,7 @@ extern void parport_release(struct pardevice *dev);
 /* parport_yield relinquishes the port if it would be helpful to other
  * drivers.  The return value is the same as for parport_claim.
  */
-extern __inline__ int parport_yield(struct pardevice *dev)
+static __inline__ int parport_yield(struct pardevice *dev)
 {
 	unsigned long int timeslip = (jiffies - dev->time);
 	if ((dev->port->waithead == NULL) || (timeslip < dev->timeslice))
@@ -289,7 +289,7 @@ extern __inline__ int parport_yield(struct pardevice *dev)
 /* parport_yield_blocking is the same but uses parport_claim_or_block
  * instead of parport_claim.
  */
-extern __inline__ int parport_yield_blocking(struct pardevice *dev)
+static __inline__ int parport_yield_blocking(struct pardevice *dev)
 {
 	unsigned long int timeslip = (jiffies - dev->time);
 	if ((dev->port->waithead == NULL) || (timeslip < dev->timeslice))
@@ -301,7 +301,7 @@ extern __inline__ int parport_yield_blocking(struct pardevice *dev)
 /*
  * Lowlevel drivers _can_ call this support function to handle irqs.
  */
-extern __inline__ void parport_generic_irq(int irq, struct parport *port,
+static __inline__ void parport_generic_irq(int irq, struct parport *port,
 					   struct pt_regs *regs)
 {
 	read_lock(&port->cad_lock);
diff --git a/pfinet/linux-src/include/linux/parport_pc.h b/pfinet/linux-src/include/linux/parport_pc.h
index f7ef3406..c040693a 100644
--- a/pfinet/linux-src/include/linux/parport_pc.h
+++ b/pfinet/linux-src/include/linux/parport_pc.h
@@ -25,27 +25,27 @@ extern int parport_pc_epp_clear_timeout(struct parport *pb);
 
 extern volatile unsigned char parport_pc_ctr;
 
-extern __inline__ void parport_pc_write_epp(struct parport *p, unsigned char d)
+static __inline__ void parport_pc_write_epp(struct parport *p, unsigned char d)
 {
 	outb(d, EPPDATA(p));
 }
 
-extern __inline__ unsigned char parport_pc_read_epp(struct parport *p)
+static __inline__ unsigned char parport_pc_read_epp(struct parport *p)
 {
 	return inb(EPPDATA(p));
 }
 
-extern __inline__ void parport_pc_write_epp_addr(struct parport *p, unsigned char d)
+static __inline__ void parport_pc_write_epp_addr(struct parport *p, unsigned char d)
 {
 	outb(d, EPPADDR(p));
 }
 
-extern __inline__ unsigned char parport_pc_read_epp_addr(struct parport *p)
+static __inline__ unsigned char parport_pc_read_epp_addr(struct parport *p)
 {
 	return inb(EPPADDR(p));
 }
 
-extern __inline__ int parport_pc_check_epp_timeout(struct parport *p)
+static __inline__ int parport_pc_check_epp_timeout(struct parport *p)
 {
 	if (!(inb(STATUS(p)) & 1))
 		return 0;
@@ -53,35 +53,35 @@ extern __inline__ int parport_pc_check_epp_timeout(struct parport *p)
 	return 1;
 }
 
-extern __inline__ unsigned char parport_pc_read_configb(struct parport *p)
+static __inline__ unsigned char parport_pc_read_configb(struct parport *p)
 {
 	return inb(CONFIGB(p));
 }
 
-extern __inline__ void parport_pc_write_data(struct parport *p, unsigned char d)
+static __inline__ void parport_pc_write_data(struct parport *p, unsigned char d)
 {
 	outb(d, DATA(p));
 }
 
-extern __inline__ unsigned char parport_pc_read_data(struct parport *p)
+static __inline__ unsigned char parport_pc_read_data(struct parport *p)
 {
 	return inb(DATA(p));
 }
 
-extern __inline__ void parport_pc_write_control(struct parport *p, unsigned char d)
+static __inline__ void parport_pc_write_control(struct parport *p, unsigned char d)
 {
 	struct parport_pc_private *priv = p->private_data;
 	priv->ctr = d;/* update soft copy */
 	outb(d, CONTROL(p));
 }
 
-extern __inline__ unsigned char parport_pc_read_control(struct parport *p)
+static __inline__ unsigned char parport_pc_read_control(struct parport *p)
 {
 	struct parport_pc_private *priv = p->private_data;
 	return priv->ctr;
 }
 
-extern __inline__ unsigned char parport_pc_frob_control(struct parport *p, unsigned char mask,  unsigned char val)
+static __inline__ unsigned char parport_pc_frob_control(struct parport *p, unsigned char mask,  unsigned char val)
 {
 	struct parport_pc_private *priv = p->private_data;
 	unsigned char ctr = priv->ctr;
@@ -90,27 +90,27 @@ extern __inline__ unsigned char parport_pc_frob_control(struct parport *p, unsig
 	return priv->ctr = ctr; /* update soft copy */
 }
 
-extern __inline__ void parport_pc_write_status(struct parport *p, unsigned char d)
+static __inline__ void parport_pc_write_status(struct parport *p, unsigned char d)
 {
 	outb(d, STATUS(p));
 }
 
-extern __inline__ unsigned char parport_pc_read_status(struct parport *p)
+static __inline__ unsigned char parport_pc_read_status(struct parport *p)
 {
 	return inb(STATUS(p));
 }
 
-extern __inline__ void parport_pc_write_econtrol(struct parport *p, unsigned char d)
+static __inline__ void parport_pc_write_econtrol(struct parport *p, unsigned char d)
 {
 	outb(d, ECONTROL(p));
 }
 
-extern __inline__ unsigned char parport_pc_read_econtrol(struct parport *p)
+static __inline__ unsigned char parport_pc_read_econtrol(struct parport *p)
 {
 	return inb(ECONTROL(p));
 }
 
-extern __inline__ unsigned char parport_pc_frob_econtrol(struct parport *p, unsigned char mask,  unsigned char val)
+static __inline__ unsigned char parport_pc_frob_econtrol(struct parport *p, unsigned char mask,  unsigned char val)
 {
 	unsigned char old = inb(ECONTROL(p));
 	outb(((old & ~mask) ^ val), ECONTROL(p));
diff --git a/pfinet/linux-src/include/linux/quotaops.h b/pfinet/linux-src/include/linux/quotaops.h
index bb76e715..ffa500ce 100644
--- a/pfinet/linux-src/include/linux/quotaops.h
+++ b/pfinet/linux-src/include/linux/quotaops.h
@@ -37,13 +37,13 @@ extern int  dquot_transfer(struct dentry *dentry, struct iattr *iattr,
 /*
  * Operations supported for diskquotas.
  */
-extern __inline__ void DQUOT_INIT(struct inode *inode)
+static __inline__ void DQUOT_INIT(struct inode *inode)
 {
 	if (inode->i_sb && inode->i_sb->dq_op)
 		inode->i_sb->dq_op->initialize(inode, -1);
 }
 
-extern __inline__ void DQUOT_DROP(struct inode *inode)
+static __inline__ void DQUOT_DROP(struct inode *inode)
 {
 	if (IS_QUOTAINIT(inode)) {
 		if (inode->i_sb && inode->i_sb->dq_op)
@@ -51,7 +51,7 @@ extern __inline__ void DQUOT_DROP(struct inode *inode)
 	}
 }
 
-extern __inline__ int DQUOT_PREALLOC_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
+static __inline__ int DQUOT_PREALLOC_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
 {
 	if (sb->dq_op) {
 		if (sb->dq_op->alloc_block(inode, fs_to_dq_blocks(nr, sb->s_blocksize),
@@ -61,7 +61,7 @@ extern __inline__ int DQUOT_PREALLOC_BLOCK(struct super_block *sb, const struct
 	return 0;
 }
 
-extern __inline__ int DQUOT_ALLOC_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
+static __inline__ int DQUOT_ALLOC_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
 {
 	if (sb->dq_op) {
 		if (sb->dq_op->alloc_block(inode, fs_to_dq_blocks(nr, sb->s_blocksize),
@@ -71,7 +71,7 @@ extern __inline__ int DQUOT_ALLOC_BLOCK(struct super_block *sb, const struct ino
 	return 0;
 }
 
-extern __inline__ int DQUOT_ALLOC_INODE(struct super_block *sb, struct inode *inode)
+static __inline__ int DQUOT_ALLOC_INODE(struct super_block *sb, struct inode *inode)
 {
 	if (sb->dq_op) {
 		sb->dq_op->initialize (inode, -1);
@@ -82,19 +82,19 @@ extern __inline__ int DQUOT_ALLOC_INODE(struct super_block *sb, struct inode *in
 	return 0;
 }
 
-extern __inline__ void DQUOT_FREE_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
+static __inline__ void DQUOT_FREE_BLOCK(struct super_block *sb, const struct inode *inode, int nr)
 {
 	if (sb->dq_op)
 		sb->dq_op->free_block(inode, fs_to_dq_blocks(nr, sb->s_blocksize));
 }
 
-extern __inline__ void DQUOT_FREE_INODE(struct super_block *sb, struct inode *inode)
+static __inline__ void DQUOT_FREE_INODE(struct super_block *sb, struct inode *inode)
 {
 	if (sb->dq_op)
 		sb->dq_op->free_inode(inode, 1);
 }
 
-extern __inline__ int DQUOT_TRANSFER(struct dentry *dentry, struct iattr *iattr)
+static __inline__ int DQUOT_TRANSFER(struct dentry *dentry, struct iattr *iattr)
 {
 	int error = -EDQUOT;
 
diff --git a/pfinet/linux-src/include/linux/rtnetlink.h b/pfinet/linux-src/include/linux/rtnetlink.h
index 548a9b14..ae529034 100644
--- a/pfinet/linux-src/include/linux/rtnetlink.h
+++ b/pfinet/linux-src/include/linux/rtnetlink.h
@@ -515,7 +515,7 @@ enum
 extern atomic_t rtnl_rlockct;
 extern struct wait_queue *rtnl_wait;
 
-extern __inline__ int rtattr_strcmp(struct rtattr *rta, char *str)
+static __inline__ int rtattr_strcmp(struct rtattr *rta, char *str)
 {
 	int len = strlen(str) + 1;
 	return len > rta->rta_len || memcmp(RTA_DATA(rta), str, len);
@@ -563,7 +563,7 @@ extern unsigned long rtnl_wlockct;
  * useful thing. --ANK
  */
 
-extern __inline__ int rtnl_shlock_nowait(void)
+static __inline__ int rtnl_shlock_nowait(void)
 {
 	atomic_inc(&rtnl_rlockct);
 	if (test_bit(0, &rtnl_wlockct)) {
@@ -573,7 +573,7 @@ extern __inline__ int rtnl_shlock_nowait(void)
 	return 0;
 }
 
-extern __inline__ void rtnl_shlock(void)
+static __inline__ void rtnl_shlock(void)
 {
 	while (rtnl_shlock_nowait())
 		sleep_on(&rtnl_wait);
@@ -583,7 +583,7 @@ extern __inline__ void rtnl_shlock(void)
    Shared lock must be already grabbed with rtnl_shlock*().
  */
 
-extern __inline__ int rtnl_exlock_nowait(void)
+static __inline__ int rtnl_exlock_nowait(void)
 {
 	if (atomic_read(&rtnl_rlockct) > 1)
 		return -EAGAIN;
@@ -592,14 +592,14 @@ extern __inline__ int rtnl_exlock_nowait(void)
 	return 0;
 }
 
-extern __inline__ void rtnl_exlock(void)
+static __inline__ void rtnl_exlock(void)
 {
 	while (rtnl_exlock_nowait())
 		sleep_on(&rtnl_wait);
 }
 
 #if 0
-extern __inline__ void rtnl_shunlock(void)
+static __inline__ void rtnl_shunlock(void)
 {
 	atomic_dec(&rtnl_rlockct);
 	if (atomic_read(&rtnl_rlockct) <= 1) {
@@ -628,7 +628,7 @@ extern __inline__ void rtnl_shunlock(void)
  * it will be done later after releasing shared lock.
  */
 
-extern __inline__ void rtnl_exunlock(void)
+static __inline__ void rtnl_exunlock(void)
 {
 	clear_bit(0, &rtnl_wlockct);
 	wake_up(&rtnl_wait);
@@ -636,7 +636,7 @@ extern __inline__ void rtnl_exunlock(void)
 
 #else
 
-extern __inline__ void rtnl_shlock(void)
+static __inline__ void rtnl_shlock(void)
 {
 #ifndef _HURD_
 	while (atomic_read(&rtnl_rlockct))
@@ -645,7 +645,7 @@ extern __inline__ void rtnl_shlock(void)
 #endif
 }
 
-extern __inline__ void rtnl_shunlock(void)
+static __inline__ void rtnl_shunlock(void)
 {
 #ifndef _HURD_
 	if (atomic_dec_and_test(&rtnl_rlockct))
@@ -653,11 +653,11 @@ extern __inline__ void rtnl_shunlock(void)
 #endif
 }
 
-extern __inline__ void rtnl_exlock(void)
+static __inline__ void rtnl_exlock(void)
 {
 }
 
-extern __inline__ void rtnl_exunlock(void)
+static __inline__ void rtnl_exunlock(void)
 {
 }
 
diff --git a/pfinet/linux-src/include/linux/sched.h b/pfinet/linux-src/include/linux/sched.h
index d983c17e..c0e54d86 100644
--- a/pfinet/linux-src/include/linux/sched.h
+++ b/pfinet/linux-src/include/linux/sched.h
@@ -410,7 +410,7 @@ extern struct task_struct *task[NR_TASKS];
 extern struct task_struct **tarray_freelist;
 extern spinlock_t taskslot_lock;
 
-extern __inline__ void add_free_taskslot(struct task_struct **t)
+static __inline__ void add_free_taskslot(struct task_struct **t)
 {
 	spin_lock(&taskslot_lock);
 	*t = (struct task_struct *) tarray_freelist;
@@ -418,7 +418,7 @@ extern __inline__ void add_free_taskslot(struct task_struct **t)
 	spin_unlock(&taskslot_lock);
 }
 
-extern __inline__ struct task_struct **get_free_taskslot(void)
+static __inline__ struct task_struct **get_free_taskslot(void)
 {
 	struct task_struct **tslot;
 
@@ -436,7 +436,7 @@ extern struct task_struct *pidhash[PIDHASH_SZ];
 
 #define pid_hashfn(x)	((((x) >> 8) ^ (x)) & (PIDHASH_SZ - 1))
 
-extern __inline__ void hash_pid(struct task_struct *p)
+static __inline__ void hash_pid(struct task_struct *p)
 {
 	struct task_struct **htable = &pidhash[pid_hashfn(p->pid)];
 
@@ -446,14 +446,14 @@ extern __inline__ void hash_pid(struct task_struct *p)
 	p->pidhash_pprev = htable;
 }
 
-extern __inline__ void unhash_pid(struct task_struct *p)
+static __inline__ void unhash_pid(struct task_struct *p)
 {
 	if(p->pidhash_next)
 		p->pidhash_next->pidhash_pprev = p->pidhash_pprev;
 	*p->pidhash_pprev = p->pidhash_next;
 }
 
-extern __inline__ struct task_struct *find_task_by_pid(int pid)
+static __inline__ struct task_struct *find_task_by_pid(int pid)
 {
 	struct task_struct *p, **htable = &pidhash[pid_hashfn(pid)];
 
diff --git a/pfinet/linux-src/include/linux/skbuff.h b/pfinet/linux-src/include/linux/skbuff.h
index 82d5da6e..452cbdaf 100644
--- a/pfinet/linux-src/include/linux/skbuff.h
+++ b/pfinet/linux-src/include/linux/skbuff.h
@@ -134,62 +134,46 @@ struct sk_buff {
 #include <asm/system.h>
 
 extern void			__kfree_skb(struct sk_buff *skb);
-extern void			skb_queue_head_init(struct sk_buff_head *list);
-extern void			skb_queue_head(struct sk_buff_head *list,struct sk_buff *buf);
-extern void			skb_queue_tail(struct sk_buff_head *list,struct sk_buff *buf);
-extern struct sk_buff *		skb_dequeue(struct sk_buff_head *list);
-extern void 			skb_insert(struct sk_buff *old,struct sk_buff *newsk);
-extern void			skb_append(struct sk_buff *old,struct sk_buff *newsk);
-extern void			skb_unlink(struct sk_buff *buf);
-extern __u32			skb_queue_len(struct sk_buff_head *list);
 extern struct sk_buff *		skb_peek_copy(struct sk_buff_head *list);
 extern struct sk_buff *		alloc_skb(unsigned int size, int priority);
-extern struct sk_buff *		dev_alloc_skb(unsigned int size);
 extern void			kfree_skbmem(struct sk_buff *skb);
 extern struct sk_buff *		skb_clone(struct sk_buff *skb, int priority);
 extern struct sk_buff *		skb_copy(struct sk_buff *skb, int priority);
 extern struct sk_buff *		skb_realloc_headroom(struct sk_buff *skb, int newheadroom);
 #define dev_kfree_skb(a)	kfree_skb(a)
-extern unsigned char *		skb_put(struct sk_buff *skb, unsigned int len);
-extern unsigned char *		skb_push(struct sk_buff *skb, unsigned int len);
-extern unsigned char *		skb_pull(struct sk_buff *skb, unsigned int len);
-extern int			skb_headroom(struct sk_buff *skb);
-extern int			skb_tailroom(struct sk_buff *skb);
-extern void			skb_reserve(struct sk_buff *skb, unsigned int len);
-extern void 			skb_trim(struct sk_buff *skb, unsigned int len);
 extern void	skb_over_panic(struct sk_buff *skb, int len, void *here);
 extern void	skb_under_panic(struct sk_buff *skb, int len, void *here);
 
 /* Internal */
-extern __inline__ atomic_t *skb_datarefp(struct sk_buff *skb)
+static __inline__ atomic_t *skb_datarefp(struct sk_buff *skb)
 {
 	return (atomic_t *)(skb->end);
 }
 
-extern __inline__ int skb_queue_empty(struct sk_buff_head *list)
+static __inline__ int skb_queue_empty(struct sk_buff_head *list)
 {
 	return (list->next == (struct sk_buff *) list);
 }
 
-extern __inline__ void kfree_skb(struct sk_buff *skb)
+static __inline__ void kfree_skb(struct sk_buff *skb)
 {
 	if (atomic_dec_and_test(&skb->users))
 		__kfree_skb(skb);
 }
 
 /* Use this if you didn't touch the skb state [for fast switching] */
-extern __inline__ void kfree_skb_fast(struct sk_buff *skb)
+static __inline__ void kfree_skb_fast(struct sk_buff *skb)
 {
 	if (atomic_dec_and_test(&skb->users))
 		kfree_skbmem(skb);	
 }
 
-extern __inline__ int skb_cloned(struct sk_buff *skb)
+static __inline__ int skb_cloned(struct sk_buff *skb)
 {
 	return skb->cloned && atomic_read(skb_datarefp(skb)) != 1;
 }
 
-extern __inline__ int skb_shared(struct sk_buff *skb)
+static __inline__ int skb_shared(struct sk_buff *skb)
 {
 	return (atomic_read(&skb->users) != 1);
 }
@@ -201,7 +185,7 @@ extern __inline__ int skb_shared(struct sk_buff *skb)
  *	a packet thats being forwarded.
  */
  
-extern __inline__ struct sk_buff *skb_unshare(struct sk_buff *skb, int pri)
+static __inline__ struct sk_buff *skb_unshare(struct sk_buff *skb, int pri)
 {
 	struct sk_buff *nskb;
 	if(!skb_cloned(skb))
@@ -218,7 +202,7 @@ extern __inline__ struct sk_buff *skb_unshare(struct sk_buff *skb, int pri)
  *	type system cli() peek the buffer copy the data and sti();
  */
  
-extern __inline__ struct sk_buff *skb_peek(struct sk_buff_head *list_)
+static __inline__ struct sk_buff *skb_peek(struct sk_buff_head *list_)
 {
 	struct sk_buff *list = ((struct sk_buff *)list_)->next;
 	if (list == (struct sk_buff *)list_)
@@ -226,7 +210,7 @@ extern __inline__ struct sk_buff *skb_peek(struct sk_buff_head *list_)
 	return list;
 }
 
-extern __inline__ struct sk_buff *skb_peek_tail(struct sk_buff_head *list_)
+static __inline__ struct sk_buff *skb_peek_tail(struct sk_buff_head *list_)
 {
 	struct sk_buff *list = ((struct sk_buff *)list_)->prev;
 	if (list == (struct sk_buff *)list_)
@@ -238,12 +222,12 @@ extern __inline__ struct sk_buff *skb_peek_tail(struct sk_buff_head *list_)
  *	Return the length of an sk_buff queue
  */
  
-extern __inline__ __u32 skb_queue_len(struct sk_buff_head *list_)
+static __inline__ __u32 skb_queue_len(struct sk_buff_head *list_)
 {
 	return(list_->qlen);
 }
 
-extern __inline__ void skb_queue_head_init(struct sk_buff_head *list)
+static __inline__ void skb_queue_head_init(struct sk_buff_head *list)
 {
 	list->prev = (struct sk_buff *)list;
 	list->next = (struct sk_buff *)list;
@@ -257,7 +241,7 @@ extern __inline__ void skb_queue_head_init(struct sk_buff_head *list)
  *	can only be called with interrupts disabled.
  */
 
-extern __inline__ void __skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk)
+static __inline__ void __skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk)
 {
 	struct sk_buff *prev, *next;
 
@@ -273,7 +257,7 @@ extern __inline__ void __skb_queue_head(struct sk_buff_head *list, struct sk_buf
 
 extern spinlock_t skb_queue_lock;
 
-extern __inline__ void skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk)
+static __inline__ void skb_queue_head(struct sk_buff_head *list, struct sk_buff *newsk)
 {
 	unsigned long flags;
 
@@ -286,7 +270,7 @@ extern __inline__ void skb_queue_head(struct sk_buff_head *list, struct sk_buff
  *	Insert an sk_buff at the end of a list.
  */
 
-extern __inline__ void __skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk)
+static __inline__ void __skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk)
 {
 	struct sk_buff *prev, *next;
 
@@ -300,7 +284,7 @@ extern __inline__ void __skb_queue_tail(struct sk_buff_head *list, struct sk_buf
 	prev->next = newsk;
 }
 
-extern __inline__ void skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk)
+static __inline__ void skb_queue_tail(struct sk_buff_head *list, struct sk_buff *newsk)
 {
 	unsigned long flags;
 
@@ -313,7 +297,7 @@ extern __inline__ void skb_queue_tail(struct sk_buff_head *list, struct sk_buff
  *	Remove an sk_buff from a list.
  */
 
-extern __inline__ struct sk_buff *__skb_dequeue(struct sk_buff_head *list)
+static __inline__ struct sk_buff *__skb_dequeue(struct sk_buff_head *list)
 {
 	struct sk_buff *next, *prev, *result;
 
@@ -333,7 +317,7 @@ extern __inline__ struct sk_buff *__skb_dequeue(struct sk_buff_head *list)
 	return result;
 }
 
-extern __inline__ struct sk_buff *skb_dequeue(struct sk_buff_head *list)
+static __inline__ struct sk_buff *skb_dequeue(struct sk_buff_head *list)
 {
 	long flags;
 	struct sk_buff *result;
@@ -348,7 +332,7 @@ extern __inline__ struct sk_buff *skb_dequeue(struct sk_buff_head *list)
  *	Insert a packet on a list.
  */
 
-extern __inline__ void __skb_insert(struct sk_buff *newsk,
+static __inline__ void __skb_insert(struct sk_buff *newsk,
 	struct sk_buff * prev, struct sk_buff *next,
 	struct sk_buff_head * list)
 {
@@ -363,7 +347,7 @@ extern __inline__ void __skb_insert(struct sk_buff *newsk,
 /*
  *	Place a packet before a given packet in a list
  */
-extern __inline__ void skb_insert(struct sk_buff *old, struct sk_buff *newsk)
+static __inline__ void skb_insert(struct sk_buff *old, struct sk_buff *newsk)
 {
 	unsigned long flags;
 
@@ -376,12 +360,12 @@ extern __inline__ void skb_insert(struct sk_buff *old, struct sk_buff *newsk)
  *	Place a packet after a given packet in a list.
  */
 
-extern __inline__ void __skb_append(struct sk_buff *old, struct sk_buff *newsk)
+static __inline__ void __skb_append(struct sk_buff *old, struct sk_buff *newsk)
 {
 	__skb_insert(newsk, old, old->next, old->list);
 }
 
-extern __inline__ void skb_append(struct sk_buff *old, struct sk_buff *newsk)
+static __inline__ void skb_append(struct sk_buff *old, struct sk_buff *newsk)
 {
 	unsigned long flags;
 
@@ -394,7 +378,7 @@ extern __inline__ void skb_append(struct sk_buff *old, struct sk_buff *newsk)
  * remove sk_buff from list. _Must_ be called atomically, and with
  * the list known..
  */
-extern __inline__ void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list)
+static __inline__ void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list)
 {
 	struct sk_buff * next, * prev;
 
@@ -415,7 +399,7 @@ extern __inline__ void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *li
  *	_FIRST_.
  */
 
-extern __inline__ void skb_unlink(struct sk_buff *skb)
+static __inline__ void skb_unlink(struct sk_buff *skb)
 {
 	unsigned long flags;
 
@@ -426,7 +410,7 @@ extern __inline__ void skb_unlink(struct sk_buff *skb)
 }
 
 /* XXX: more streamlined implementation */
-extern __inline__ struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list)
+static __inline__ struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list)
 {
 	struct sk_buff *skb = skb_peek_tail(list); 
 	if (skb)
@@ -434,7 +418,7 @@ extern __inline__ struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list)
 	return skb;
 }
 
-extern __inline__ struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list)
+static __inline__ struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list)
 {
 	long flags;
 	struct sk_buff *result;
@@ -449,7 +433,7 @@ extern __inline__ struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list)
  *	Add data to an sk_buff
  */
  
-extern __inline__ unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
+static __inline__ unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
 {
 	unsigned char *tmp=skb->tail;
 	skb->tail+=len;
@@ -457,7 +441,7 @@ extern __inline__ unsigned char *__skb_put(struct sk_buff *skb, unsigned int len
 	return tmp;
 }
 
-extern __inline__ unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
+static __inline__ unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
 {
 	unsigned char *tmp=skb->tail;
 	skb->tail+=len;
@@ -471,14 +455,14 @@ here:		;
 	return tmp;
 }
 
-extern __inline__ unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
+static __inline__ unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
 {
 	skb->data-=len;
 	skb->len+=len;
 	return skb->data;
 }
 
-extern __inline__ unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
+static __inline__ unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
 {
 	skb->data-=len;
 	skb->len+=len;
@@ -491,49 +475,49 @@ here: 		;
 	return skb->data;
 }
 
-extern __inline__ char *__skb_pull(struct sk_buff *skb, unsigned int len)
+static __inline__ char *__skb_pull(struct sk_buff *skb, unsigned int len)
 {
 	skb->len-=len;
 	return 	skb->data+=len;
 }
 
-extern __inline__ unsigned char * skb_pull(struct sk_buff *skb, unsigned int len)
+static __inline__ unsigned char * skb_pull(struct sk_buff *skb, unsigned int len)
 {	
 	if (len > skb->len)
 		return NULL;
 	return __skb_pull(skb,len);
 }
 
-extern __inline__ int skb_headroom(struct sk_buff *skb)
+static __inline__ int skb_headroom(struct sk_buff *skb)
 {
 	return skb->data-skb->head;
 }
 
-extern __inline__ int skb_tailroom(struct sk_buff *skb)
+static __inline__ int skb_tailroom(struct sk_buff *skb)
 {
 	return skb->end-skb->tail;
 }
 
-extern __inline__ void skb_reserve(struct sk_buff *skb, unsigned int len)
+static __inline__ void skb_reserve(struct sk_buff *skb, unsigned int len)
 {
 	skb->data+=len;
 	skb->tail+=len;
 }
 
-extern __inline__ void __skb_trim(struct sk_buff *skb, unsigned int len)
+static __inline__ void __skb_trim(struct sk_buff *skb, unsigned int len)
 {
 	skb->len = len;
 	skb->tail = skb->data+len;
 }
 
-extern __inline__ void skb_trim(struct sk_buff *skb, unsigned int len)
+static __inline__ void skb_trim(struct sk_buff *skb, unsigned int len)
 {
 	if (skb->len > len) {
 		__skb_trim(skb, len);
 	}
 }
 
-extern __inline__ void skb_orphan(struct sk_buff *skb)
+static __inline__ void skb_orphan(struct sk_buff *skb)
 {
 	if (skb->destructor)
 		skb->destructor(skb);
@@ -541,14 +525,14 @@ extern __inline__ void skb_orphan(struct sk_buff *skb)
 	skb->sk = NULL;
 }
 
-extern __inline__ void skb_queue_purge(struct sk_buff_head *list)
+static __inline__ void skb_queue_purge(struct sk_buff_head *list)
 {
 	struct sk_buff *skb;
 	while ((skb=skb_dequeue(list))!=NULL)
 		kfree_skb(skb);
 }
 
-extern __inline__ struct sk_buff *dev_alloc_skb(unsigned int length)
+static __inline__ struct sk_buff *dev_alloc_skb(unsigned int length)
 {
 	struct sk_buff *skb;
 
@@ -558,7 +542,7 @@ extern __inline__ struct sk_buff *dev_alloc_skb(unsigned int length)
 	return skb;
 }
 
-extern __inline__ struct sk_buff *
+static __inline__ struct sk_buff *
 skb_cow(struct sk_buff *skb, unsigned int headroom)
 {
 	headroom = (headroom+15)&~15;
diff --git a/pfinet/linux-src/include/linux/tqueue.h b/pfinet/linux-src/include/linux/tqueue.h
index d886f753..b75892b9 100644
--- a/pfinet/linux-src/include/linux/tqueue.h
+++ b/pfinet/linux-src/include/linux/tqueue.h
@@ -80,7 +80,7 @@ extern spinlock_t tqueue_lock;
 /*
  * queue_task
  */
-extern __inline__ void queue_task(struct tq_struct *bh_pointer,
+static __inline__ void queue_task(struct tq_struct *bh_pointer,
 			   task_queue *bh_list)
 {
 	if (!test_and_set_bit(0,&bh_pointer->sync)) {
@@ -95,7 +95,7 @@ extern __inline__ void queue_task(struct tq_struct *bh_pointer,
 /*
  * Call all "bottom halfs" on a given list.
  */
-extern __inline__ void run_task_queue(task_queue *list)
+static __inline__ void run_task_queue(task_queue *list)
 {
 	if (*list) {
 		unsigned long flags;
diff --git a/pfinet/linux-src/include/net/addrconf.h b/pfinet/linux-src/include/net/addrconf.h
index 4b270775..d54f5e78 100644
--- a/pfinet/linux-src/include/net/addrconf.h
+++ b/pfinet/linux-src/include/net/addrconf.h
@@ -119,7 +119,7 @@ static __inline__ int ipv6_devindex_hash(int ifindex)
  *	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,
@@ -127,7 +127,7 @@ extern __inline__ void addrconf_addr_solict_mult_old(struct in6_addr *addr,
 		      __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,
@@ -137,21 +137,21 @@ extern __inline__ void addrconf_addr_solict_mult_new(struct in6_addr *addr,
 }
 
 
-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);
 }
diff --git a/pfinet/linux-src/include/net/checksum.h b/pfinet/linux-src/include/net/checksum.h
index 041d4760..3b72321a 100644
--- a/pfinet/linux-src/include/net/checksum.h
+++ b/pfinet/linux-src/include/net/checksum.h
@@ -93,7 +93,7 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
 #endif
 
 #ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
-extern __inline__
+static __inline__
 unsigned int csum_and_copy_from_user (const char *src, char *dst,
 				      int len, int sum, int *err_ptr)
 {
diff --git a/pfinet/linux-src/include/net/dst.h b/pfinet/linux-src/include/net/dst.h
index baf4f414..ceb4f400 100644
--- a/pfinet/linux-src/include/net/dst.h
+++ b/pfinet/linux-src/include/net/dst.h
@@ -80,7 +80,7 @@ struct dst_ops
 extern struct dst_entry * dst_garbage_list;
 extern atomic_t	dst_total;
 
-extern __inline__
+static __inline__
 struct dst_entry * dst_clone(struct dst_entry * dst)
 {
 	if (dst)
@@ -88,7 +88,7 @@ struct dst_entry * dst_clone(struct dst_entry * dst)
 	return dst;
 }
 
-extern __inline__
+static __inline__
 void dst_release(struct dst_entry * dst)
 {
 	if (dst)
@@ -99,7 +99,7 @@ void dst_release(struct dst_entry * dst)
    destination entry has just been removed from a location
    accessed directly by hard irq.
  */
-extern __inline__
+static __inline__
 void dst_release_irqwait(struct dst_entry * dst)
 {
 	if (dst) {
@@ -108,7 +108,7 @@ void dst_release_irqwait(struct dst_entry * dst)
 	}
 }
 
-extern __inline__
+static __inline__
 struct dst_entry * dst_check(struct dst_entry ** dst_p, u32 cookie)
 {
 	struct dst_entry * dst = *dst_p;
@@ -117,7 +117,7 @@ struct dst_entry * dst_check(struct dst_entry ** dst_p, u32 cookie)
 	return (*dst_p = dst);
 }
 
-extern __inline__
+static __inline__
 struct dst_entry * dst_reroute(struct dst_entry ** dst_p, struct sk_buff *skb)
 {
 	struct dst_entry * dst = *dst_p;
@@ -127,11 +127,11 @@ struct dst_entry * dst_reroute(struct dst_entry ** dst_p, struct sk_buff *skb)
 }
 
 
-extern void * dst_alloc(int size, struct dst_ops * ops);
 extern void __dst_free(struct dst_entry * dst);
+extern void * dst_alloc(int size, struct dst_ops * ops);
 extern void dst_destroy(struct dst_entry * dst);
 
-extern __inline__
+static __inline__
 void dst_free(struct dst_entry * dst)
 {
 	if (dst->obsolete > 1)
@@ -143,27 +143,27 @@ void dst_free(struct dst_entry * dst)
 	__dst_free(dst);
 }
 
-extern __inline__ void dst_confirm(struct dst_entry *dst)
+static __inline__ void dst_confirm(struct dst_entry *dst)
 {
 	if (dst)
 		neigh_confirm(dst->neighbour);
 }
 
-extern __inline__ void dst_negative_advice(struct dst_entry **dst_p)
+static __inline__ void dst_negative_advice(struct dst_entry **dst_p)
 {
 	struct dst_entry * dst = *dst_p;
 	if (dst && dst->ops->negative_advice)
 		*dst_p = dst->ops->negative_advice(dst);
 }
 
-extern __inline__ void dst_link_failure(struct sk_buff *skb)
+static __inline__ void dst_link_failure(struct sk_buff *skb)
 {
 	struct dst_entry * dst = skb->dst;
 	if (dst && dst->ops && dst->ops->link_failure)
 		dst->ops->link_failure(skb);
 }
 
-extern __inline__ void dst_set_expires(struct dst_entry *dst, int timeout)
+static __inline__ void dst_set_expires(struct dst_entry *dst, int timeout)
 {
 	unsigned long expires = jiffies + timeout;
 
diff --git a/pfinet/linux-src/include/net/if_inet6.h b/pfinet/linux-src/include/net/if_inet6.h
index 4e9ed978..515b8c76 100644
--- a/pfinet/linux-src/include/net/if_inet6.h
+++ b/pfinet/linux-src/include/net/if_inet6.h
@@ -117,7 +117,7 @@ struct inet6_dev
 
 extern struct ipv6_devconf ipv6_devconf;
 
-extern __inline__ void ipv6_eth_mc_map(struct in6_addr *addr, char *buf)
+static __inline__ void ipv6_eth_mc_map(struct in6_addr *addr, char *buf)
 {
 	/*
 	 *	+-------+-------+-------+-------+-------+-------+
diff --git a/pfinet/linux-src/include/net/ip.h b/pfinet/linux-src/include/net/ip.h
index 1a6cb610..1519ea0f 100644
--- a/pfinet/linux-src/include/net/ip.h
+++ b/pfinet/linux-src/include/net/ip.h
@@ -137,7 +137,7 @@ extern struct linux_mib	net_statistics;
 
 extern int sysctl_local_port_range[2];
 
-extern __inline__ int ip_finish_output(struct sk_buff *skb)
+static __inline__ int ip_finish_output(struct sk_buff *skb)
 {
 	struct dst_entry *dst = skb->dst;
 	struct device *dev = dst->dev;
@@ -159,7 +159,7 @@ extern __inline__ int ip_finish_output(struct sk_buff *skb)
 	return -EINVAL;
 }
 
-extern __inline__ void ip_send(struct sk_buff *skb)
+static __inline__ void ip_send(struct sk_buff *skb)
 {
 	if (skb->len > skb->dst->pmtu)
 		ip_fragment(skb, __ip_finish_output);
@@ -167,7 +167,7 @@ extern __inline__ void ip_send(struct sk_buff *skb)
 		ip_finish_output(skb);
 }
 
-extern __inline__
+static __inline__
 int ip_decrease_ttl(struct iphdr *iph)
 {
 	u16 check = iph->check;
@@ -178,7 +178,7 @@ int ip_decrease_ttl(struct iphdr *iph)
 	return --iph->ttl;
 }
 
-extern __inline__
+static __inline__
 int ip_dont_fragment(struct sock *sk, struct dst_entry *dst)
 {
 	return (sk->ip_pmtudisc == IP_PMTUDISC_DO ||
@@ -190,7 +190,7 @@ int ip_dont_fragment(struct sock *sk, struct dst_entry *dst)
  *	Map a multicast IP onto multicast MAC for type ethernet.
  */
 
-extern __inline__ void ip_eth_mc_map(u32 addr, char *buf)
+static __inline__ void ip_eth_mc_map(u32 addr, char *buf)
 {
 	addr=ntohl(addr);
 	buf[0]=0x01;
@@ -210,7 +210,7 @@ extern __inline__ void ip_eth_mc_map(u32 addr, char *buf)
  *      multicast packets.
  */
 
-extern __inline__ void ip_tr_mc_map(u32 addr, char *buf)
+static __inline__ void ip_tr_mc_map(u32 addr, char *buf)
 {
 	buf[0]=0xC0;
 	buf[1]=0x00;
diff --git a/pfinet/linux-src/include/net/ip6_fib.h b/pfinet/linux-src/include/net/ip6_fib.h
index efd652f2..64b0ef20 100644
--- a/pfinet/linux-src/include/net/ip6_fib.h
+++ b/pfinet/linux-src/include/net/ip6_fib.h
@@ -95,7 +95,7 @@ struct fib6_walker_t
 
 extern struct fib6_walker_t fib6_walker_list;
 
-extern __inline__ void fib6_walker_link(struct fib6_walker_t *w)
+static __inline__ void fib6_walker_link(struct fib6_walker_t *w)
 {
 	w->next = fib6_walker_list.next;
 	w->prev = &fib6_walker_list;
@@ -103,7 +103,7 @@ extern __inline__ void fib6_walker_link(struct fib6_walker_t *w)
 	w->prev->next = w;
 }
 
-extern __inline__ void fib6_walker_unlink(struct fib6_walker_t *w)
+static __inline__ void fib6_walker_unlink(struct fib6_walker_t *w)
 {
 	w->next->prev = w->prev;
 	w->prev->next = w->next;
diff --git a/pfinet/linux-src/include/net/ip6_route.h b/pfinet/linux-src/include/net/ip6_route.h
index 9311cc34..369f4227 100644
--- a/pfinet/linux-src/include/net/ip6_route.h
+++ b/pfinet/linux-src/include/net/ip6_route.h
@@ -92,7 +92,7 @@ extern void rt6_mtu_change(struct device *dev, unsigned mtu);
  *	For UDP/RAW sockets this is done on udp_connect.
  */
 
-extern __inline__ void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
+static __inline__ void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
 				     struct in6_addr *daddr)
 {
 	struct ipv6_pinfo *np;
diff --git a/pfinet/linux-src/include/net/ip_fib.h b/pfinet/linux-src/include/net/ip_fib.h
index 76a2fbc3..60338945 100644
--- a/pfinet/linux-src/include/net/ip_fib.h
+++ b/pfinet/linux-src/include/net/ip_fib.h
@@ -138,19 +138,19 @@ struct fib_table
 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))
@@ -158,7 +158,7 @@ extern __inline__ int fib_lookup(const struct rt_key *key, struct fib_result *re
 	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);
@@ -172,7 +172,7 @@ extern struct fib_table * fib_tables[RT_TABLE_MAX+1];
 extern int fib_lookup(const struct rt_key *key, struct fib_result *res);
 extern struct fib_table *__fib_new_table(int id);
 
-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;
@@ -180,7 +180,7 @@ extern __inline__ struct fib_table *fib_get_table(int id)
 	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;
@@ -238,7 +238,7 @@ extern u32 fib_rules_policy(u32 saddr, struct fib_result *res, unsigned *flags);
 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
diff --git a/pfinet/linux-src/include/net/ipv6.h b/pfinet/linux-src/include/net/ipv6.h
index 60ea0536..11625091 100644
--- a/pfinet/linux-src/include/net/ipv6.h
+++ b/pfinet/linux-src/include/net/ipv6.h
@@ -159,7 +159,7 @@ extern int			ipv6_flowlabel_opt(struct sock *sk, char *optval, int optlen);
 extern void			ip6_flowlabel_init(void);
 extern void			ip6_flowlabel_cleanup(void);
 
-extern __inline__ void fl6_sock_release(struct ip6_flowlabel *fl)
+static __inline__ void fl6_sock_release(struct ip6_flowlabel *fl)
 {
 	if (fl)
 		atomic_dec(&fl->users);
@@ -193,23 +193,23 @@ typedef int		(*inet_getfrag_t) (const void *data,
 
 extern int		ipv6_addr_type(struct in6_addr *addr);
 
-extern __inline__ int ipv6_addr_scope(struct in6_addr *addr)
+static __inline__ int ipv6_addr_scope(struct in6_addr *addr)
 {
 	return ipv6_addr_type(addr) & IPV6_ADDR_SCOPE_MASK;
 }
 
-extern __inline__ int ipv6_addr_cmp(struct in6_addr *a1, struct in6_addr *a2)
+static __inline__ int ipv6_addr_cmp(struct in6_addr *a1, struct in6_addr *a2)
 {
 	return memcmp((void *) a1, (void *) a2, sizeof(struct in6_addr));
 }
 
-extern __inline__ void ipv6_addr_copy(struct in6_addr *a1, struct in6_addr *a2)
+static __inline__ void ipv6_addr_copy(struct in6_addr *a1, struct in6_addr *a2)
 {
 	memcpy((void *) a1, (void *) a2, sizeof(struct in6_addr));
 }
 
 #ifndef __HAVE_ARCH_ADDR_SET
-extern __inline__ void ipv6_addr_set(struct in6_addr *addr, 
+static __inline__ void ipv6_addr_set(struct in6_addr *addr, 
 				     __u32 w1, __u32 w2,
 				     __u32 w3, __u32 w4)
 {
@@ -220,7 +220,7 @@ extern __inline__ void ipv6_addr_set(struct in6_addr *addr,
 }
 #endif
 
-extern __inline__ int ipv6_addr_any(struct in6_addr *a)
+static __inline__ int ipv6_addr_any(struct in6_addr *a)
 {
 	return ((a->s6_addr32[0] | a->s6_addr32[1] | 
 		 a->s6_addr32[2] | a->s6_addr32[3] ) == 0); 
diff --git a/pfinet/linux-src/include/net/ndisc.h b/pfinet/linux-src/include/net/ndisc.h
index 7a51f367..9c603207 100644
--- a/pfinet/linux-src/include/net/ndisc.h
+++ b/pfinet/linux-src/include/net/ndisc.h
@@ -101,7 +101,7 @@ extern int			igmp6_event_report(struct sk_buff *skb,
 
 extern void			igmp6_cleanup(void);
 
-extern __inline__ struct neighbour * ndisc_get_neigh(struct device *dev, struct in6_addr *addr)
+static __inline__ struct neighbour * ndisc_get_neigh(struct device *dev, struct in6_addr *addr)
 {
 
 	if (dev) {
diff --git a/pfinet/linux-src/include/net/neighbour.h b/pfinet/linux-src/include/net/neighbour.h
index ab79f17c..67ba3e53 100644
--- a/pfinet/linux-src/include/net/neighbour.h
+++ b/pfinet/linux-src/include/net/neighbour.h
@@ -207,26 +207,26 @@ extern void			neigh_sysctl_unregister(struct neigh_parms *p);
  *	is only referenced by the corresponding table.
  */
 
-extern __inline__ void neigh_release(struct neighbour *neigh)
+static __inline__ void neigh_release(struct neighbour *neigh)
 {
 	if (atomic_dec_and_test(&neigh->refcnt) && neigh->tbl == NULL)
 		neigh_destroy(neigh);
 }
 
-extern __inline__ struct neighbour * neigh_clone(struct neighbour *neigh)
+static __inline__ struct neighbour * neigh_clone(struct neighbour *neigh)
 {
 	if (neigh)
 		atomic_inc(&neigh->refcnt);
 	return neigh;
 }
 
-extern __inline__ void neigh_confirm(struct neighbour *neigh)
+static __inline__ void neigh_confirm(struct neighbour *neigh)
 {
 	if (neigh)
 		neigh->confirmed = jiffies;
 }
 
-extern __inline__ struct neighbour *
+static __inline__ struct neighbour *
 neigh_lookup(struct neigh_table *tbl, const void *pkey, struct device *dev)
 {
 	struct neighbour *neigh;
@@ -236,17 +236,17 @@ neigh_lookup(struct neigh_table *tbl, const void *pkey, struct device *dev)
 	return neigh;
 }
 
-extern __inline__ int neigh_is_connected(struct neighbour *neigh)
+static __inline__ int neigh_is_connected(struct neighbour *neigh)
 {
 	return neigh->nud_state&NUD_CONNECTED;
 }
 
-extern __inline__ int neigh_is_valid(struct neighbour *neigh)
+static __inline__ int neigh_is_valid(struct neighbour *neigh)
 {
 	return neigh->nud_state&NUD_VALID;
 }
 
-extern __inline__ int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
+static __inline__ int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 {
 	neigh->used = jiffies;
 	if (!(neigh->nud_state&(NUD_CONNECTED|NUD_DELAY|NUD_PROBE)))
@@ -254,13 +254,13 @@ extern __inline__ int neigh_event_send(struct neighbour *neigh, struct sk_buff *
 	return 0;
 }
 
-extern __inline__ void neigh_table_lock(struct neigh_table *tbl)
+static __inline__ void neigh_table_lock(struct neigh_table *tbl)
 {
 	atomic_inc(&tbl->lock);
 	synchronize_bh();
 }
 
-extern __inline__ void neigh_table_unlock(struct neigh_table *tbl)
+static __inline__ void neigh_table_unlock(struct neigh_table *tbl)
 {
 	atomic_dec(&tbl->lock);
 }
diff --git a/pfinet/linux-src/include/net/pkt_cls.h b/pfinet/linux-src/include/net/pkt_cls.h
index b8547e60..13e24a9b 100644
--- a/pfinet/linux-src/include/net/pkt_cls.h
+++ b/pfinet/linux-src/include/net/pkt_cls.h
@@ -63,7 +63,7 @@ struct tcf_proto_ops
    specific classifiers.
  */
 
-extern __inline__ int tc_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_result *res)
+static __inline__ int tc_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_result *res)
 {
 	int err = 0;
 	u32 protocol = skb->protocol;
@@ -77,7 +77,7 @@ extern __inline__ int tc_classify(struct sk_buff *skb, struct tcf_proto *tp, str
 	return -1;
 }
 
-extern __inline__ unsigned long cls_set_class(unsigned long *clp, unsigned long cl)
+static __inline__ unsigned long cls_set_class(unsigned long *clp, unsigned long cl)
 {
 	unsigned long old_cl; 
 
diff --git a/pfinet/linux-src/include/net/pkt_sched.h b/pfinet/linux-src/include/net/pkt_sched.h
index c2ef8656..b441789e 100644
--- a/pfinet/linux-src/include/net/pkt_sched.h
+++ b/pfinet/linux-src/include/net/pkt_sched.h
@@ -354,7 +354,7 @@ extern struct tcf_police * tcf_police_locate(struct rtattr *rta, struct rtattr *
 extern int tcf_police_dump(struct sk_buff *skb, struct tcf_police *p);
 extern int tcf_police(struct sk_buff *skb, struct tcf_police *p);
 
-extern __inline__ void tcf_police_release(struct tcf_police *p)
+static __inline__ void tcf_police_release(struct tcf_police *p)
 {
 	if (p && --p->refcnt == 0)
 		tcf_police_destroy(p);
@@ -387,7 +387,7 @@ int pktsched_init(void);
 void qdisc_run_queues(void);
 int qdisc_restart(struct device *dev);
 
-extern __inline__ void qdisc_wakeup(struct device *dev)
+static __inline__ void qdisc_wakeup(struct device *dev)
 {
 	if (!dev->tbusy) {
 		struct Qdisc *q = dev->qdisc;
@@ -398,7 +398,7 @@ extern __inline__ void qdisc_wakeup(struct device *dev)
 	}
 }
 
-extern __inline__ unsigned psched_mtu(struct device *dev)
+static __inline__ unsigned psched_mtu(struct device *dev)
 {
 	unsigned mtu = dev->mtu;
 	return dev->hard_header ? mtu + dev->hard_header_len : mtu;
diff --git a/pfinet/linux-src/include/net/profile.h b/pfinet/linux-src/include/net/profile.h
index 82fad0a3..e4b24e9f 100644
--- a/pfinet/linux-src/include/net/profile.h
+++ b/pfinet/linux-src/include/net/profile.h
@@ -28,14 +28,14 @@ extern void net_profile_irq_adjust(struct timeval *entered, struct timeval* leav
 #if CPU == 586 || CPU == 686
 
 
-extern __inline__ void  net_profile_stamp(struct timeval *pstamp)
+static __inline__ void  net_profile_stamp(struct timeval *pstamp)
 {
 	__asm__ __volatile__ (".byte 0x0f,0x31"
 		:"=a" (pstamp->tv_usec),
 		"=d" (pstamp->tv_sec));
 }
 
-extern __inline__ void  net_profile_accumulate(struct timeval *entered,
+static __inline__ void  net_profile_accumulate(struct timeval *entered,
 					       struct timeval *leaved,
 					       struct timeval *acc)
 {
@@ -51,7 +51,7 @@ extern __inline__ void  net_profile_accumulate(struct timeval *entered,
 			      "0" (acc->tv_usec), "1" (acc->tv_sec));
 }
 
-extern __inline__ void  net_profile_sub(struct timeval *sub,
+static __inline__ void  net_profile_sub(struct timeval *sub,
 					struct timeval *acc)
 {
 	__asm__ __volatile__ ("subl %2,%0\n\t" 
@@ -61,7 +61,7 @@ extern __inline__ void  net_profile_sub(struct timeval *sub,
 			      "0" (acc->tv_usec), "1" (acc->tv_sec));
 }
 
-extern __inline__ void  net_profile_add(struct timeval *add,
+static __inline__ void  net_profile_add(struct timeval *add,
 					struct timeval *acc)
 {
 	__asm__ __volatile__ ("addl %2,%0\n\t" 
@@ -79,7 +79,7 @@ extern long alpha_hi;
 
 /* On alpha cycle counter has only 32 bits :-( :-( */
 
-extern __inline__ void  net_profile_stamp(struct timeval *pstamp)
+static __inline__ void  net_profile_stamp(struct timeval *pstamp)
 {
 	__u32 result;
 	__asm__ __volatile__ ("rpcc %0" : "r="(result));
@@ -90,7 +90,7 @@ extern __inline__ void  net_profile_stamp(struct timeval *pstamp)
 	pstamp->tv_usec = alpha_lo;
 }
 
-extern __inline__ void  net_profile_accumulate(struct timeval *entered,
+static __inline__ void  net_profile_accumulate(struct timeval *entered,
 					       struct timeval *leaved,
 					       struct timeval *acc)
 {
@@ -112,7 +112,7 @@ extern __inline__ void  net_profile_accumulate(struct timeval *entered,
 	acc->tv_usec = usecs;
 }
 
-extern __inline__ void  net_profile_sub(struct timeval *entered,
+static __inline__ void  net_profile_sub(struct timeval *entered,
 					struct timeval *leaved)
 {
 	time_t usecs = leaved->tv_usec - entered->tv_usec;
@@ -126,7 +126,7 @@ extern __inline__ void  net_profile_sub(struct timeval *entered,
 	leaved->tv_usec = usecs;
 }
 
-extern __inline__ void  net_profile_add(struct timeval *entered, struct timeval *leaved)
+static __inline__ void  net_profile_add(struct timeval *entered, struct timeval *leaved)
 {
 	time_t usecs = leaved->tv_usec + entered->tv_usec;
 	time_t secs = leaved->tv_sec + entered->tv_sec;
@@ -142,7 +142,7 @@ extern __inline__ void  net_profile_add(struct timeval *entered, struct timeval
 
 #else
 
-extern __inline__ void  net_profile_stamp(struct timeval *pstamp)
+static __inline__ void  net_profile_stamp(struct timeval *pstamp)
 {
 	/* Not "fast" counterpart! On architectures without
 	   cpu clock "fast" routine is absolutely useless in this
@@ -153,7 +153,7 @@ extern __inline__ void  net_profile_stamp(struct timeval *pstamp)
 	do_gettimeofday(pstamp);
 }
 
-extern __inline__ void  net_profile_accumulate(struct timeval *entered,
+static __inline__ void  net_profile_accumulate(struct timeval *entered,
 					       struct timeval *leaved,
 					       struct timeval *acc)
 {
@@ -175,7 +175,7 @@ extern __inline__ void  net_profile_accumulate(struct timeval *entered,
 	acc->tv_usec = usecs;
 }
 
-extern __inline__ void  net_profile_sub(struct timeval *entered,
+static __inline__ void  net_profile_sub(struct timeval *entered,
 					struct timeval *leaved)
 {
 	time_t usecs = leaved->tv_usec - entered->tv_usec;
@@ -189,7 +189,7 @@ extern __inline__ void  net_profile_sub(struct timeval *entered,
 	leaved->tv_usec = usecs;
 }
 
-extern __inline__ void  net_profile_add(struct timeval *entered, struct timeval *leaved)
+static __inline__ void  net_profile_add(struct timeval *entered, struct timeval *leaved)
 {
 	time_t usecs = leaved->tv_usec + entered->tv_usec;
 	time_t secs = leaved->tv_sec + entered->tv_sec;
@@ -206,7 +206,7 @@ extern __inline__ void  net_profile_add(struct timeval *entered, struct timeval
 
 #endif
 
-extern __inline__ void net_profile_enter(struct net_profile_slot *s)
+static __inline__ void net_profile_enter(struct net_profile_slot *s)
 {
 	unsigned long flags;
 
@@ -219,7 +219,7 @@ extern __inline__ void net_profile_enter(struct net_profile_slot *s)
 	restore_flags(flags);
 }
 
-extern __inline__ void net_profile_leave_irq(struct net_profile_slot *s)
+static __inline__ void net_profile_leave_irq(struct net_profile_slot *s)
 {
 	unsigned long flags;
 
@@ -240,7 +240,7 @@ extern __inline__ void net_profile_leave_irq(struct net_profile_slot *s)
 	restore_flags(flags);
 }
 
-extern __inline__ void net_profile_leave(struct net_profile_slot *s)
+static __inline__ void net_profile_leave(struct net_profile_slot *s)
 {
 	unsigned long flags;
 	save_flags(flags);
diff --git a/pfinet/linux-src/include/net/route.h b/pfinet/linux-src/include/net/route.h
index 66df4712..40aabdf6 100644
--- a/pfinet/linux-src/include/net/route.h
+++ b/pfinet/linux-src/include/net/route.h
@@ -124,7 +124,7 @@ extern void		ip_rt_get_source(u8 *src, struct rtable *rt);
 extern int		ip_rt_dump(struct sk_buff *skb,  struct netlink_callback *cb);
 
 
-extern __inline__ void ip_rt_put(struct rtable * rt)
+static __inline__ void ip_rt_put(struct rtable * rt)
 {
 	if (rt)
 		dst_release(&rt->u.dst);
@@ -132,12 +132,12 @@ extern __inline__ void ip_rt_put(struct rtable * rt)
 
 extern __u8 ip_tos2prio[16];
 
-extern __inline__ char rt_tos2priority(u8 tos)
+static __inline__ char rt_tos2priority(u8 tos)
 {
 	return ip_tos2prio[IPTOS_TOS(tos)>>1];
 }
 
-extern __inline__ int ip_route_connect(struct rtable **rp, u32 dst, u32 src, u32 tos, int oif)
+static __inline__ int ip_route_connect(struct rtable **rp, u32 dst, u32 src, u32 tos, int oif)
 {
 	int err;
 	err = ip_route_output(rp, dst, src, tos, oif);
diff --git a/pfinet/linux-src/include/net/sock.h b/pfinet/linux-src/include/net/sock.h
index 96fdfe8b..b149224a 100644
--- a/pfinet/linux-src/include/net/sock.h
+++ b/pfinet/linux-src/include/net/sock.h
@@ -724,7 +724,6 @@ extern struct sk_buff		*sock_rmalloc(struct sock *sk,
 extern void			sock_wfree(struct sk_buff *skb);
 extern void			sock_rfree(struct sk_buff *skb);
 extern unsigned long		sock_rspace(struct sock *sk);
-extern unsigned long		sock_wspace(struct sock *sk);
 
 extern int			sock_setsockopt(struct socket *sock, int level,
 						int op, char *optval,
@@ -800,7 +799,7 @@ extern void sklist_destroy_socket(struct sock **list, struct sock *sk);
  * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller
  * than pkt_len we keep whole skb->data.
  */
-extern __inline__ int sk_filter(struct sk_buff *skb, struct sk_filter *filter)
+static __inline__ int sk_filter(struct sk_buff *skb, struct sk_filter *filter)
 {
 	int pkt_len;
 
@@ -813,7 +812,7 @@ extern __inline__ int sk_filter(struct sk_buff *skb, struct sk_filter *filter)
 	return 0;
 }
 
-extern __inline__ void sk_filter_release(struct sock *sk, struct sk_filter *fp)
+static __inline__ void sk_filter_release(struct sock *sk, struct sk_filter *fp)
 {
 	unsigned int size = sk_filter_len(fp);
 
@@ -823,7 +822,7 @@ extern __inline__ void sk_filter_release(struct sock *sk, struct sk_filter *fp)
 		kfree_s(fp, size);
 }
 
-extern __inline__ void sk_filter_charge(struct sock *sk, struct sk_filter *fp)
+static __inline__ void sk_filter_charge(struct sock *sk, struct sk_filter *fp)
 {
 	atomic_inc(&fp->refcnt);
 	atomic_add(sk_filter_len(fp), &sk->omem_alloc);
@@ -840,14 +839,14 @@ extern __inline__ void sk_filter_charge(struct sock *sk, struct sk_filter *fp)
  *	packet ever received.
  */
 
-extern __inline__ void skb_set_owner_w(struct sk_buff *skb, struct sock *sk)
+static __inline__ void skb_set_owner_w(struct sk_buff *skb, struct sock *sk)
 {
 	skb->sk = sk;
 	skb->destructor = sock_wfree;
 	atomic_add(skb->truesize, &sk->wmem_alloc);
 }
 
-extern __inline__ void skb_set_owner_r(struct sk_buff *skb, struct sock *sk)
+static __inline__ void skb_set_owner_r(struct sk_buff *skb, struct sock *sk)
 {
 	skb->sk = sk;
 	skb->destructor = sock_rfree;
@@ -855,7 +854,7 @@ extern __inline__ void skb_set_owner_r(struct sk_buff *skb, struct sock *sk)
 }
 
 
-extern __inline__ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+static __inline__ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
 #ifdef CONFIG_FILTER
 	struct sk_filter *filter;
@@ -878,7 +877,7 @@ extern __inline__ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 	return 0;
 }
 
-extern __inline__ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
+static __inline__ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
 {
 	/* Cast skb->rcvbuf to unsigned... It's pointless, but reduces
 	   number of warnings when compiling with -W --ANK
@@ -896,13 +895,13 @@ extern __inline__ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
  *	Recover an error report and clear atomically
  */
  
-extern __inline__ int sock_error(struct sock *sk)
+static __inline__ int sock_error(struct sock *sk)
 {
 	int err=xchg(&sk->err,0);
 	return -err;
 }
 
-extern __inline__ unsigned long sock_wspace(struct sock *sk)
+static __inline__ unsigned long sock_wspace(struct sock *sk)
 {
 	int amt = 0;
 
@@ -918,7 +917,7 @@ extern __inline__ unsigned long sock_wspace(struct sock *sk)
  *	Default write policy as shown to user space via poll/select/SIGIO
  *	Kernel internally doesn't use the MIN_WRITE_SPACE threshold.
  */
-extern __inline__ int sock_writeable(struct sock *sk) 
+static __inline__ int sock_writeable(struct sock *sk) 
 {
 	return sock_wspace(sk) >= MIN_WRITE_SPACE;
 }
@@ -933,7 +932,7 @@ extern void net_delete_timer (struct sock *);
 extern void net_reset_timer (struct sock *, int, unsigned long);
 extern void net_timer (unsigned long);
 
-extern __inline__ int gfp_any(void)
+static __inline__ int gfp_any(void)
 {
 	return in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
 }
diff --git a/pfinet/linux-src/include/net/tcp.h b/pfinet/linux-src/include/net/tcp.h
index abb4b210..96b8071d 100644
--- a/pfinet/linux-src/include/net/tcp.h
+++ b/pfinet/linux-src/include/net/tcp.h
@@ -428,19 +428,19 @@ struct tcp_func {
  * and worry about wraparound (automatic with unsigned arithmetic).
  */
 
-extern __inline int before(__u32 seq1, __u32 seq2)
+static __inline int before(__u32 seq1, __u32 seq2)
 {
         return (__s32)(seq1-seq2) < 0;
 }
 
-extern __inline int after(__u32 seq1, __u32 seq2)
+static __inline int after(__u32 seq1, __u32 seq2)
 {
 	return (__s32)(seq2-seq1) < 0;
 }
 
 
 /* is s2<=s1<=s3 ? */
-extern __inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
+static __inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
 {
 	return seq3 - seq2 >= seq1 - seq2;
 }
@@ -659,7 +659,7 @@ extern u32	__tcp_select_window(struct sock *sk);
  * value can be stuffed directly into th->window for an outgoing
  * frame.
  */
-extern __inline__ u16 tcp_select_window(struct sock *sk)
+static __inline__ u16 tcp_select_window(struct sock *sk)
 {
 	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
 	u32 cur_win = tcp_receive_window(tp);
@@ -686,7 +686,7 @@ extern __inline__ u16 tcp_select_window(struct sock *sk)
  * can increase our advertisement.  If it becomes more than
  * twice what we are talking about right now, return true.
  */
-extern __inline__ int tcp_raise_window(struct sock *sk)
+static __inline__ int tcp_raise_window(struct sock *sk)
 {
 	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
 	u32 cur_win = tcp_receive_window(tp);
@@ -704,7 +704,7 @@ extern __inline__ int tcp_raise_window(struct sock *sk)
  * as well, however we keep track of that using different
  * units so a conversion is necessary.  -DaveM
  */
-extern __inline__ __u32 tcp_recalc_ssthresh(struct tcp_opt *tp)
+static __inline__ __u32 tcp_recalc_ssthresh(struct tcp_opt *tp)
 {
 	__u32 snd_wnd_packets = tp->snd_wnd / max(tp->mss_cache, 1);
 
@@ -847,7 +847,7 @@ static __inline__ void tcp_push_pending_frames(struct sock *sk, struct tcp_opt *
  * problem. Thanks to Stephen A. Wood <saw@cebaf.gov>  -FvK
  */
 
-extern __inline const int tcp_connected(const int state)
+static __inline const int tcp_connected(const int state)
 {
 	return ((1 << state) &
 	       	(TCPF_ESTABLISHED|TCPF_CLOSE_WAIT|TCPF_FIN_WAIT1|
@@ -934,7 +934,7 @@ static __inline__ void tcp_build_and_update_options(__u32 *ptr, struct tcp_opt *
  * MAX_SYN_SIZE to match the new maximum number of options that you
  * can generate.
  */
-extern __inline__ void tcp_syn_build_options(__u32 *ptr, int mss, int ts, int sack,
+static __inline__ void tcp_syn_build_options(__u32 *ptr, int mss, int ts, int sack,
 					     int offer_wscale, int wscale, __u32 tstamp, __u32 ts_recent)
 {
 	/* We always get an MSS option.
@@ -974,7 +974,7 @@ extern __inline__ void tcp_syn_build_options(__u32 *ptr, int mss, int ts, int sa
  * be a multiple of mss if possible. We assume here that mss >= 1.
  * This MUST be enforced by all callers.
  */
-extern __inline__ void tcp_select_initial_window(__u32 space, __u16 mss,
+static __inline__ void tcp_select_initial_window(__u32 space, __u16 mss,
 	__u32 *rcv_wnd,
 	__u32 *window_clamp,
 	int wscale_ok,
@@ -1008,28 +1008,28 @@ extern __inline__ void tcp_select_initial_window(__u32 space, __u16 mss,
 	(*window_clamp) = min(65535<<(*rcv_wscale),*window_clamp);
 }
 
-extern __inline__ void tcp_synq_unlink(struct tcp_opt *tp, struct open_request *req, struct open_request *prev)
+static __inline__ void tcp_synq_unlink(struct tcp_opt *tp, struct open_request *req, struct open_request *prev)
 {
 	if(!req->dl_next)
 		tp->syn_wait_last = (struct open_request **)prev;
 	prev->dl_next = req->dl_next;
 }
 
-extern __inline__ void tcp_synq_queue(struct tcp_opt *tp, struct open_request *req)
+static __inline__ void tcp_synq_queue(struct tcp_opt *tp, struct open_request *req)
 { 
 	req->dl_next = NULL;
 	*tp->syn_wait_last = req; 
 	tp->syn_wait_last = &req->dl_next;
 }
 
-extern __inline__ void tcp_synq_init(struct tcp_opt *tp)
+static __inline__ void tcp_synq_init(struct tcp_opt *tp)
 {
 	tp->syn_wait_queue = NULL;
 	tp->syn_wait_last = &tp->syn_wait_queue;
 }
 
 extern void __tcp_inc_slow_timer(struct tcp_sl_timer *slt);
-extern __inline__ void tcp_inc_slow_timer(int timer)
+static __inline__ void tcp_inc_slow_timer(int timer)
 {
 	struct tcp_sl_timer *slt = &tcp_slt_array[timer];
 	
@@ -1041,7 +1041,7 @@ extern __inline__ void tcp_inc_slow_timer(int timer)
 	atomic_inc(&slt->count);
 }
 
-extern __inline__ void tcp_dec_slow_timer(int timer)
+static __inline__ void tcp_dec_slow_timer(int timer)
 {
 	struct tcp_sl_timer *slt = &tcp_slt_array[timer];