|
@@ -506,7 +506,7 @@ int arp_bind_neighbour(struct dst_entry *dst)
|
|
if (dev == NULL)
|
|
if (dev == NULL)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
if (n == NULL) {
|
|
if (n == NULL) {
|
|
- __be32 nexthop = ((struct rtable*)dst)->rt_gateway;
|
|
|
|
|
|
+ __be32 nexthop = ((struct rtable *)dst)->rt_gateway;
|
|
if (dev->flags&(IFF_LOOPBACK|IFF_POINTOPOINT))
|
|
if (dev->flags&(IFF_LOOPBACK|IFF_POINTOPOINT))
|
|
nexthop = 0;
|
|
nexthop = 0;
|
|
n = __neigh_lookup_errno(
|
|
n = __neigh_lookup_errno(
|
|
@@ -640,14 +640,14 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
|
|
arp_ptr=(unsigned char *)(arp+1);
|
|
arp_ptr=(unsigned char *)(arp+1);
|
|
|
|
|
|
memcpy(arp_ptr, src_hw, dev->addr_len);
|
|
memcpy(arp_ptr, src_hw, dev->addr_len);
|
|
- arp_ptr+=dev->addr_len;
|
|
|
|
- memcpy(arp_ptr, &src_ip,4);
|
|
|
|
- arp_ptr+=4;
|
|
|
|
|
|
+ arp_ptr += dev->addr_len;
|
|
|
|
+ memcpy(arp_ptr, &src_ip, 4);
|
|
|
|
+ arp_ptr += 4;
|
|
if (target_hw != NULL)
|
|
if (target_hw != NULL)
|
|
memcpy(arp_ptr, target_hw, dev->addr_len);
|
|
memcpy(arp_ptr, target_hw, dev->addr_len);
|
|
else
|
|
else
|
|
memset(arp_ptr, 0, dev->addr_len);
|
|
memset(arp_ptr, 0, dev->addr_len);
|
|
- arp_ptr+=dev->addr_len;
|
|
|
|
|
|
+ arp_ptr += dev->addr_len;
|
|
memcpy(arp_ptr, &dest_ip, 4);
|
|
memcpy(arp_ptr, &dest_ip, 4);
|
|
|
|
|
|
return skb;
|
|
return skb;
|
|
@@ -823,9 +823,9 @@ static int arp_process(struct sk_buff *skb)
|
|
int dont_send = 0;
|
|
int dont_send = 0;
|
|
|
|
|
|
if (!dont_send)
|
|
if (!dont_send)
|
|
- dont_send |= arp_ignore(in_dev,sip,tip);
|
|
|
|
|
|
+ dont_send |= arp_ignore(in_dev, sip, tip);
|
|
if (!dont_send && IN_DEV_ARPFILTER(in_dev))
|
|
if (!dont_send && IN_DEV_ARPFILTER(in_dev))
|
|
- dont_send |= arp_filter(sip,tip,dev);
|
|
|
|
|
|
+ dont_send |= arp_filter(sip, tip, dev);
|
|
if (!dont_send)
|
|
if (!dont_send)
|
|
arp_send(ARPOP_REPLY,ETH_P_ARP,sip,dev,tip,sha,dev->dev_addr,sha);
|
|
arp_send(ARPOP_REPLY,ETH_P_ARP,sip,dev,tip,sha,dev->dev_addr,sha);
|
|
|
|
|