patch-2.1.23 linux/include/linux/etherdevice.h

Next file: linux/include/linux/fs.h
Previous file: linux/include/linux/binfmts.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.22/linux/include/linux/etherdevice.h linux/include/linux/etherdevice.h
@@ -24,7 +24,7 @@
 #ifndef _LINUX_ETHERDEVICE_H
 #define _LINUX_ETHERDEVICE_H
 
-
+#include <linux/config.h>
 #include <linux/if_ether.h>
 
 #ifdef __KERNEL__
@@ -37,9 +37,17 @@
 						unsigned char * haddr);
 extern int		eth_header_cache(struct dst_entry *dst, struct dst_entry *neigh,
 					 struct hh_cache *hh);
+extern struct device	* init_etherdev(struct device *, int);
+
+#ifdef CONFIG_IP_ROUTER
+static void inline eth_copy_and_sum (struct sk_buff *dest, unsigned char *src, int len, int base)
+{
+    memcpy (dest->data, src, len);
+}
+#else
 extern void		eth_copy_and_sum(struct sk_buff *dest,
 				unsigned char *src, int length, int base);
-extern struct device	* init_etherdev(struct device *, int);
+#endif
 
 #endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov