diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /include/net/arp.h | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/net/arp.h')
| -rw-r--r-- | include/net/arp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/arp.h b/include/net/arp.h index a1f09fad6a52..a13e30c35f42 100644 --- a/include/net/arp.h +++ b/include/net/arp.h | |||
| @@ -11,7 +11,7 @@ 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, | 13 | extern int arp_rcv(struct sk_buff *skb, struct net_device *dev, |
| 14 | struct packet_type *pt); | 14 | struct packet_type *pt, struct net_device *orig_dev); |
| 15 | extern int arp_find(unsigned char *haddr, struct sk_buff *skb); | 15 | extern int arp_find(unsigned char *haddr, struct sk_buff *skb); |
| 16 | extern int arp_ioctl(unsigned int cmd, void __user *arg); | 16 | extern int arp_ioctl(unsigned int cmd, void __user *arg); |
| 17 | extern void arp_send(int type, int ptype, u32 dest_ip, | 17 | extern void arp_send(int type, int ptype, u32 dest_ip, |