diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
| commit | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch) | |
| tree | 86227af3c9ad0d90823e5488a86f7f453ed1837a /include/net/arp.h | |
| parent | 201e06279823c73242de987f192f43d2b30e5331 (diff) | |
| parent | 64541d19702cfdb7ea946fdc20faee849f6874b1 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/net/arp.h')
| -rw-r--r-- | include/net/arp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/arp.h b/include/net/arp.h index a13e30c35f42..643bded9f557 100644 --- a/include/net/arp.h +++ b/include/net/arp.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | extern struct neigh_table arp_tbl; | 10 | extern struct neigh_table arp_tbl; |
| 11 | 11 | ||
| 12 | extern void arp_init(void); | 12 | extern void arp_init(void); |
| 13 | extern int arp_rcv(struct sk_buff *skb, struct net_device *dev, | ||
| 14 | struct packet_type *pt, struct net_device *orig_dev); | ||
| 15 | extern int arp_find(unsigned char *haddr, struct sk_buff *skb); | 13 | extern int arp_find(unsigned char *haddr, struct sk_buff *skb); |
| 16 | extern int arp_ioctl(unsigned int cmd, void __user *arg); | 14 | extern int arp_ioctl(unsigned int cmd, void __user *arg); |
| 17 | extern void arp_send(int type, int ptype, u32 dest_ip, | 15 | extern void arp_send(int type, int ptype, u32 dest_ip, |