linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / net / arp.h

diff --git a/include/net/arp.h b/include/net/arp.h
index 61fd735..a13e30c 100644 (file)
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -11,9 +11,9 @@ 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 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 *arg);
+extern int     arp_ioctl(unsigned int cmd, void __user *arg);
 extern void     arp_send(int type, int ptype, u32 dest_ip, 
                         struct net_device *dev, u32 src_ip, 
                         unsigned char *dest_hw, unsigned char *src_hw, unsigned char *th);