mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 19:07:52 +00:00
Code Issues Releases Wiki Activity

net: arp: code cleanup

Browse source 
Clean the code up according to Documentation/CodingStyle.

Don't initialize the variable dont_send in arp_process().

Remove the temporary varialbe flags in arp_state_to_flags().

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Changli Gao 2010-09-02 03:56:51 +00:00 committed by David S. Miller
parent c07b68e841
commit deffd77759
1 changed files with 123 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
net/ipv4/arp.c
View file

@ -120,7 +120,7 @@ EXPORT_SYMBOL(clip_tbl_hook);
#endif #endif
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/netfilter_arp.h> #include <linux/netfilter_arp.h>
@ -296,8 +296,10 @@ static int arp_constructor(struct neighbour *neigh)
neigh->ops = &arp_broken_ops; neigh->ops = &arp_broken_ops;
neigh->output = neigh->ops->output; neigh->output = neigh->ops->output;
return 0; return 0;
#else
break;
#endif #endif
;} }
#endif #endif
if (neigh->type == RTN_MULTICAST) { if (neigh->type == RTN_MULTICAST) {
neigh->nud_state = NUD_NOARP; neigh->nud_state = NUD_NOARP;
@ -305,7 +307,8 @@ static int arp_constructor(struct neighbour *neigh)
} else if (dev->flags & (IFF_NOARP | IFF_LOOPBACK)) { } else if (dev->flags & (IFF_NOARP | IFF_LOOPBACK)) {
neigh->nud_state = NUD_NOARP; neigh->nud_state = NUD_NOARP;
memcpy(neigh->ha, dev->dev_addr, dev->addr_len); memcpy(neigh->ha, dev->dev_addr, dev->addr_len);
} else if (neigh->type == RTN_BROADCAST || dev->flags&IFF_POINTOPOINT) { } else if (neigh->type == RTN_BROADCAST ||
(dev->flags & IFF_POINTOPOINT)) {
neigh->nud_state = NUD_NOARP; neigh->nud_state = NUD_NOARP;
memcpy(neigh->ha, dev->broadcast, dev->addr_len); memcpy(neigh->ha, dev->broadcast, dev->addr_len);
} }
@ -347,7 +350,8 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
switch (IN_DEV_ARP_ANNOUNCE(in_dev)) { switch (IN_DEV_ARP_ANNOUNCE(in_dev)) {
default: default:
case 0: /* By default announce any local IP */ case 0: /* By default announce any local IP */
if (skb && inet_addr_type(dev_net(dev), ip_hdr(skb)->saddr) == RTN_LOCAL) if (skb && inet_addr_type(dev_net(dev),
ip_hdr(skb)->saddr) == RTN_LOCAL)
saddr = ip_hdr(skb)->saddr; saddr = ip_hdr(skb)->saddr;
break; break;
case 1: /* Restrict announcements of saddr in same subnet */ case 1: /* Restrict announcements of saddr in same subnet */
@ -369,17 +373,22 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
if (!saddr) if (!saddr)
saddr = inet_select_addr(dev, target, RT_SCOPE_LINK); saddr = inet_select_addr(dev, target, RT_SCOPE_LINK);
if ((probes -= neigh->parms->ucast_probes) < 0) { probes -= neigh->parms->ucast_probes;
if (probes < 0) {
if (!(neigh->nud_state & NUD_VALID)) if (!(neigh->nud_state & NUD_VALID))
printk(KERN_DEBUG "trying to ucast probe in NUD_INVALID\n"); printk(KERN_DEBUG
"trying to ucast probe in NUD_INVALID\n");
dst_ha = neigh->ha; dst_ha = neigh->ha;
read_lock_bh(&neigh->lock); read_lock_bh(&neigh->lock);
} else if ((probes -= neigh->parms->app_probes) < 0) { } else {
probes -= neigh->parms->app_probes;
if (probes < 0) {
#ifdef CONFIG_ARPD #ifdef CONFIG_ARPD
neigh_app_ns(neigh); neigh_app_ns(neigh);
#endif #endif
return; return;
} }
}
arp_send(ARPOP_REQUEST, ETH_P_ARP, target, dev, saddr, arp_send(ARPOP_REQUEST, ETH_P_ARP, target, dev, saddr,
dst_ha, dev->dev_addr, NULL); dst_ha, dev->dev_addr, NULL);
@ -451,7 +460,8 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)
* is allowed to use this function, it is scheduled to be removed. --ANK * is allowed to use this function, it is scheduled to be removed. --ANK
*/ */
static int arp_set_predefined(int addr_hint, unsigned char * haddr, __be32 paddr, struct net_device * dev) static int arp_set_predefined(int addr_hint, unsigned char *haddr,
__be32 paddr, struct net_device *dev)
{ {
switch (addr_hint) { switch (addr_hint) {
case RTN_LOCAL: case RTN_LOCAL:
@ -483,7 +493,8 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb)
paddr = skb_rtable(skb)->rt_gateway; paddr = skb_rtable(skb)->rt_gateway;
if (arp_set_predefined(inet_addr_type(dev_net(dev), paddr), haddr, paddr, dev)) if (arp_set_predefined(inet_addr_type(dev_net(dev), paddr), haddr,
paddr, dev))
return 0; return 0;
n = __neigh_lookup(&arp_tbl, &paddr, dev, 1); n = __neigh_lookup(&arp_tbl, &paddr, dev, 1);
@ -519,7 +530,8 @@ int arp_bind_neighbour(struct dst_entry *dst)
nexthop = 0; nexthop = 0;
n = __neigh_lookup_errno( n = __neigh_lookup_errno(
#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE) #if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
dev->type == ARPHRD_ATM ? clip_tbl_hook : dev->type == ARPHRD_ATM ?
clip_tbl_hook :
#endif #endif
&arp_tbl, &nexthop, dev); &arp_tbl, &nexthop, dev);
if (IS_ERR(n)) if (IS_ERR(n))
@ -543,8 +555,8 @@ static inline int arp_fwd_proxy(struct in_device *in_dev,
if (!IN_DEV_PROXY_ARP(in_dev)) if (!IN_DEV_PROXY_ARP(in_dev))
return 0; return 0;
imi = IN_DEV_MEDIUM_ID(in_dev);
if ((imi = IN_DEV_MEDIUM_ID(in_dev)) == 0) if (imi == 0)
return 1; return 1;
if (imi == -1) if (imi == -1)
return 0; return 0;
@ -735,9 +747,8 @@ void arp_send(int type, int ptype, __be32 dest_ip,
skb = arp_create(type, ptype, dest_ip, dev, src_ip, skb = arp_create(type, ptype, dest_ip, dev, src_ip,
dest_hw, src_hw, target_hw); dest_hw, src_hw, target_hw);
if (skb == NULL) { if (skb == NULL)
return; return;
}
arp_xmit(skb); arp_xmit(skb);
} }
@ -869,16 +880,17 @@ static int arp_process(struct sk_buff *skb)
addr_type = rt->rt_type; addr_type = rt->rt_type;
if (addr_type == RTN_LOCAL) { if (addr_type == RTN_LOCAL) {
int dont_send = 0; int 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) {
n = neigh_event_ns(&arp_tbl, sha, &sip, dev); n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
if (n) { if (n) {
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);
neigh_release(n); neigh_release(n);
} }
} }
@ -887,8 +899,7 @@ static int arp_process(struct sk_buff *skb)
if (addr_type == RTN_UNICAST && if (addr_type == RTN_UNICAST &&
(arp_fwd_proxy(in_dev, dev, rt) || (arp_fwd_proxy(in_dev, dev, rt) ||
arp_fwd_pvlan(in_dev, dev, rt, sip, tip) || arp_fwd_pvlan(in_dev, dev, rt, sip, tip) ||
pneigh_lookup(&arp_tbl, net, &tip, dev, 0))) pneigh_lookup(&arp_tbl, net, &tip, dev, 0))) {
{
n = neigh_event_ns(&arp_tbl, sha, &sip, dev); n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
if (n) if (n)
neigh_release(n); neigh_release(n);
@ -896,9 +907,12 @@ static int arp_process(struct sk_buff *skb)
if (NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED || if (NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED ||
skb->pkt_type == PACKET_HOST || skb->pkt_type == PACKET_HOST ||
in_dev->arp_parms->proxy_delay == 0) { in_dev->arp_parms->proxy_delay == 0) {
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);
} else { } else {
pneigh_enqueue(&arp_tbl, in_dev->arp_parms, skb); pneigh_enqueue(&arp_tbl,
in_dev->arp_parms, skb);
return 0; return 0;
} }
goto out; goto out;
@ -939,7 +953,8 @@ static int arp_process(struct sk_buff *skb)
if (arp->ar_op != htons(ARPOP_REPLY) || if (arp->ar_op != htons(ARPOP_REPLY) ||
skb->pkt_type != PACKET_HOST) skb->pkt_type != PACKET_HOST)
state = NUD_STALE; state = NUD_STALE;
neigh_update(n, sha, state, override ? NEIGH_UPDATE_F_OVERRIDE : 0); neigh_update(n, sha, state,
override ? NEIGH_UPDATE_F_OVERRIDE : 0);
neigh_release(n); neigh_release(n);
} }
@ -975,7 +990,8 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
arp->ar_pln != 4) arp->ar_pln != 4)
goto freeskb; goto freeskb;
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) skb = skb_share_check(skb, GFP_ATOMIC);
if (skb == NULL)
goto out_of_mem; goto out_of_mem;
memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb)); memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));
@ -1046,10 +1062,11 @@ static int arp_req_set(struct net *net, struct arpreq *r,
if (r->arp_flags & ATF_PERM) if (r->arp_flags & ATF_PERM)
r->arp_flags |= ATF_COM; r->arp_flags |= ATF_COM;
if (dev == NULL) { if (dev == NULL) {
struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, struct flowi fl = { .nl_u.ip4_u = { .daddr = ip,
.tos = RTO_ONLINK } } }; .tos = RTO_ONLINK } };
struct rtable *rt; struct rtable *rt;
if ((err = ip_route_output_key(net, &rt, &fl)) != 0) err = ip_route_output_key(net, &rt, &fl);
if (err != 0)
return err; return err;
dev = rt->dst.dev; dev = rt->dst.dev;
ip_rt_put(rt); ip_rt_put(rt);
@ -1094,12 +1111,12 @@ static int arp_req_set(struct net *net, struct arpreq *r,
static unsigned arp_state_to_flags(struct neighbour *neigh) static unsigned arp_state_to_flags(struct neighbour *neigh)
{ {
unsigned flags = 0;
if (neigh->nud_state&NUD_PERMANENT) if (neigh->nud_state&NUD_PERMANENT)
flags = ATF_PERM|ATF_COM; return ATF_PERM | ATF_COM;
else if (neigh->nud_state&NUD_VALID) else if (neigh->nud_state&NUD_VALID)
flags = ATF_COM; return ATF_COM;
return flags; else
return 0;
} }
/* /*
@ -1153,10 +1170,11 @@ static int arp_req_delete(struct net *net, struct arpreq *r,
ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr; ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
if (dev == NULL) { if (dev == NULL) {
struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, struct flowi fl = { .nl_u.ip4_u = { .daddr = ip,
.tos = RTO_ONLINK } } }; .tos = RTO_ONLINK } };
struct rtable *rt; struct rtable *rt;
if ((err = ip_route_output_key(net, &rt, &fl)) != 0) err = ip_route_output_key(net, &rt, &fl);
if (err != 0)
return err; return err;
dev = rt->dst.dev; dev = rt->dst.dev;
ip_rt_put(rt); ip_rt_put(rt);
@ -1211,7 +1229,8 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)
rtnl_lock(); rtnl_lock();
if (r.arp_dev[0]) { if (r.arp_dev[0]) {
err = -ENODEV; err = -ENODEV;
if ((dev = __dev_get_by_name(net, r.arp_dev)) == NULL) dev = __dev_get_by_name(net, r.arp_dev);
if (dev == NULL)
goto out; goto out;
/* Mmmm... It is wrong... ARPHRD_NETROM==0 */ /* Mmmm... It is wrong... ARPHRD_NETROM==0 */
@ -1243,7 +1262,8 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)
return err; return err;
} }
static int arp_netdev_event(struct notifier_block *this, unsigned long event, void *ptr) static int arp_netdev_event(struct notifier_block *this, unsigned long event,
void *ptr)
{ {
struct net_device *dev = ptr; struct net_device *dev = ptr;
@ -1311,12 +1331,13 @@ static char *ax2asc2(ax25_address *a, char *buf)
for (n = 0, s = buf; n < 6; n++) { for (n = 0, s = buf; n < 6; n++) {
c = (a->ax25_call[n] >> 1) & 0x7F; c = (a->ax25_call[n] >> 1) & 0x7F;
if (c != ' ') *s++ = c; if (c != ' ')
*s++ = c;
} }
*s++ = '-'; *s++ = '-';
n = (a->ax25_call[6] >> 1) & 0x0F;
if ((n = ((a->ax25_call[6] >> 1) & 0x0F)) > 9) { if (n > 9) {
*s++ = '1'; *s++ = '1';
n -= 10; n -= 10;
} }
@ -1328,7 +1349,6 @@ static char *ax2asc2(ax25_address *a, char *buf)
return "*"; return "*";
return buf; return buf;
} }
#endif /* CONFIG_AX25 */ #endif /* CONFIG_AX25 */