diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-19 00:19:55 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-19 00:19:55 +0200 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /include/net/arp.h | |
| parent | [CPUFREQ] x86_64: Proper null pointer check in powernow_k8_get (diff) | |
| parent | x86: be careful about tailcall breakage for sys_open[at] too (diff) | |
| download | linux-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.tar.xz linux-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.zip | |
Merge ../linus
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 @@ extern struct neigh_table arp_tbl; extern void arp_init(void); -extern int arp_rcv(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt, struct net_device *orig_dev); extern int arp_find(unsigned char *haddr, struct sk_buff *skb); extern int arp_ioctl(unsigned int cmd, void __user *arg); extern void arp_send(int type, int ptype, u32 dest_ip, |