summaryrefslogtreecommitdiffstats
path: root/include/linux/etherdevice.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
committer <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
commit19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch)
tree40b1cb534496a7f1ca0f5c314a523c69f1fee464 /include/linux/etherdevice.h
parent7206675c40394c78a90e74812bbdbf8cf3cca1be (diff)
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'include/linux/etherdevice.h')
-rw-r--r--include/linux/etherdevice.h23
1 files changed, 16 insertions, 7 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 9f8b97ccf..e0a3ab3c5 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -24,22 +24,31 @@
#ifndef _LINUX_ETHERDEVICE_H
#define _LINUX_ETHERDEVICE_H
-
+#include <linux/config.h>
#include <linux/if_ether.h>
#ifdef __KERNEL__
extern int eth_header(struct sk_buff *skb, struct device *dev,
unsigned short type, void *daddr,
void *saddr, unsigned len);
-extern int eth_rebuild_header(void *buff, struct device *dev,
- unsigned long dst, struct sk_buff *skb);
+extern int eth_rebuild_header(struct sk_buff *skb);
extern unsigned short eth_type_trans(struct sk_buff *skb, struct device *dev);
-extern void eth_header_cache_bind(struct hh_cache ** hhp, struct device *dev,
- unsigned short htype, __u32 daddr);
-extern void eth_header_cache_update(struct hh_cache *hh, struct device *dev, unsigned char * haddr);
+extern void eth_header_cache_update(struct hh_cache *hh, struct device *dev,
+ unsigned char * haddr);
+extern int eth_header_cache(struct dst_entry *dst,
+ struct neighbour *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