git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
net
/
ipv4
/
arp.c
diff --git
a/net/ipv4/arp.c
b/net/ipv4/arp.c
index
9b5d1e8
..
9b4b933
100644
(file)
--- a/
net/ipv4/arp.c
+++ b/
net/ipv4/arp.c
@@
-213,6
+213,9
@@
int arp_mc_map(u32 addr, u8 *haddr, struct net_device *dev, int dir)
case ARPHRD_IEEE802_TR:
ip_tr_mc_map(addr, haddr);
return 0;
case ARPHRD_IEEE802_TR:
ip_tr_mc_map(addr, haddr);
return 0;
+ case ARPHRD_INFINIBAND:
+ ip_ib_mc_map(addr, haddr);
+ return 0;
default:
if (dir) {
memcpy(haddr, dev->broadcast, dev->addr_len);
default:
if (dir) {
memcpy(haddr, dev->broadcast, dev->addr_len);
@@
-704,7
+707,7
@@
static void parp_redo(struct sk_buff *skb)
* Process an arp request.
*/
* Process an arp request.
*/
-int arp_process(struct sk_buff *skb)
+
static
int arp_process(struct sk_buff *skb)
{
struct net_device *dev = skb->dev;
struct in_device *in_dev = in_dev_get(dev);
{
struct net_device *dev = skb->dev;
struct in_device *in_dev = in_dev_get(dev);
@@
-961,7
+964,7
@@
out_of_mem:
* Set (create) an ARP cache entry.
*/
* Set (create) an ARP cache entry.
*/
-int arp_req_set(struct arpreq *r, struct net_device * dev)
+
static
int arp_req_set(struct arpreq *r, struct net_device * dev)
{
u32 ip = ((struct sockaddr_in *) &r->arp_pa)->sin_addr.s_addr;
struct neighbour *neigh;
{
u32 ip = ((struct sockaddr_in *) &r->arp_pa)->sin_addr.s_addr;
struct neighbour *neigh;
@@
-1075,7
+1078,7
@@
static int arp_req_get(struct arpreq *r, struct net_device *dev)
return err;
}
return err;
}
-int arp_req_delete(struct arpreq *r, struct net_device * dev)
+
static
int arp_req_delete(struct arpreq *r, struct net_device * dev)
{
int err;
u32 ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
{
int err;
u32 ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
@@
-1207,7
+1210,7
@@
static int arp_netdev_event(struct notifier_block *this, unsigned long event, vo
return NOTIFY_DONE;
}
return NOTIFY_DONE;
}
-struct notifier_block arp_netdev_notifier = {
+st
atic st
ruct notifier_block arp_netdev_notifier = {
.notifier_call = arp_netdev_event,
};
.notifier_call = arp_netdev_event,
};