nfsd: track last inode only in use_wgather case

[safe/jmp/linux-2.6] / include / net / arp.h

diff --git a/include/net/arp.h b/include/net/arp.h
index 36482bf..c236270 100644 (file)
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -5,7 +5,6 @@
 #include <linux/if_arp.h>
 #include <net/neighbour.h>
 
-#define HAVE_ARP_CREATE
 
 extern struct neigh_table arp_tbl;
 
@@ -14,15 +13,17 @@ extern int  arp_find(unsigned char *haddr, struct sk_buff *skb);
 extern int     arp_ioctl(struct net *net, unsigned int cmd, void __user *arg);
 extern void     arp_send(int type, int ptype, __be32 dest_ip,
                         struct net_device *dev, __be32 src_ip,
-                        unsigned char *dest_hw, unsigned char *src_hw, unsigned char *th);
+                        const unsigned char *dest_hw,
+                        const unsigned char *src_hw, const unsigned char *th);
 extern int     arp_bind_neighbour(struct dst_entry *dst);
 extern int     arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir);
 extern void    arp_ifdown(struct net_device *dev);
 
 extern struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
                                  struct net_device *dev, __be32 src_ip,
-                                 unsigned char *dest_hw, unsigned char *src_hw,
-                                 unsigned char *target_hw);
+                                 const unsigned char *dest_hw,
+                                 const unsigned char *src_hw,
+                                 const unsigned char *target_hw);
 extern void arp_xmit(struct sk_buff *skb);
 
 extern struct neigh_ops arp_broken_ops;