Commit 132adf54 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

[IPV4]: cleanup

Add whitespace around keywords.
Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ac58ee3
...@@ -1339,7 +1339,7 @@ static int __init inet_init(void) ...@@ -1339,7 +1339,7 @@ static int __init inet_init(void)
* Initialise per-cpu ipv4 mibs * Initialise per-cpu ipv4 mibs
*/ */
if(init_ipv4_mibs()) if (init_ipv4_mibs())
printk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n"); ; printk(KERN_CRIT "inet_init: Cannot init ipv4 mibs\n"); ;
ipv4_proc_init(); ipv4_proc_init();
......
...@@ -1178,7 +1178,7 @@ int arp_ioctl(unsigned int cmd, void __user *arg) ...@@ -1178,7 +1178,7 @@ int arp_ioctl(unsigned int cmd, void __user *arg)
goto out; goto out;
} }
switch(cmd) { switch (cmd) {
case SIOCDARP: case SIOCDARP:
err = arp_req_delete(&r, dev); err = arp_req_delete(&r, dev);
break; break;
......
...@@ -1174,7 +1174,7 @@ static int cipso_v4_map_cat_rng_ntoh(const struct cipso_v4_doi *doi_def, ...@@ -1174,7 +1174,7 @@ static int cipso_v4_map_cat_rng_ntoh(const struct cipso_v4_doi *doi_def,
u16 cat_low; u16 cat_low;
u16 cat_high; u16 cat_high;
for(net_iter = 0; net_iter < net_cat_len; net_iter += 4) { for (net_iter = 0; net_iter < net_cat_len; net_iter += 4) {
cat_high = ntohs(*((__be16 *)&net_cat[net_iter])); cat_high = ntohs(*((__be16 *)&net_cat[net_iter]));
if ((net_iter + 4) <= net_cat_len) if ((net_iter + 4) <= net_cat_len)
cat_low = ntohs(*((__be16 *)&net_cat[net_iter + 2])); cat_low = ntohs(*((__be16 *)&net_cat[net_iter + 2]));
......
...@@ -633,7 +633,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg) ...@@ -633,7 +633,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
dev_load(ifr.ifr_name); dev_load(ifr.ifr_name);
#endif #endif
switch(cmd) { switch (cmd) {
case SIOCGIFADDR: /* Get interface address */ case SIOCGIFADDR: /* Get interface address */
case SIOCGIFBRDADDR: /* Get the broadcast address */ case SIOCGIFBRDADDR: /* Get the broadcast address */
case SIOCGIFDSTADDR: /* Get the destination address */ case SIOCGIFDSTADDR: /* Get the destination address */
...@@ -708,7 +708,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg) ...@@ -708,7 +708,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
if (!ifa && cmd != SIOCSIFADDR && cmd != SIOCSIFFLAGS) if (!ifa && cmd != SIOCSIFADDR && cmd != SIOCSIFFLAGS)
goto done; goto done;
switch(cmd) { switch (cmd) {
case SIOCGIFADDR: /* Get interface address */ case SIOCGIFADDR: /* Get interface address */
sin->sin_addr.s_addr = ifa->ifa_local; sin->sin_addr.s_addr = ifa->ifa_local;
goto rarok; goto rarok;
......
...@@ -350,11 +350,10 @@ static void __tnode_free_rcu(struct rcu_head *head) ...@@ -350,11 +350,10 @@ static void __tnode_free_rcu(struct rcu_head *head)
static inline void tnode_free(struct tnode *tn) static inline void tnode_free(struct tnode *tn)
{ {
if(IS_LEAF(tn)) { if (IS_LEAF(tn)) {
struct leaf *l = (struct leaf *) tn; struct leaf *l = (struct leaf *) tn;
call_rcu_bh(&l->rcu, __leaf_free_rcu); call_rcu_bh(&l->rcu, __leaf_free_rcu);
} } else
else
call_rcu(&tn->rcu, __tnode_free_rcu); call_rcu(&tn->rcu, __tnode_free_rcu);
} }
...@@ -553,7 +552,7 @@ static struct node *resize(struct trie *t, struct tnode *tn) ...@@ -553,7 +552,7 @@ static struct node *resize(struct trie *t, struct tnode *tn)
/* Keep root node larger */ /* Keep root node larger */
if(!tn->parent) if (!tn->parent)
inflate_threshold_use = inflate_threshold_root; inflate_threshold_use = inflate_threshold_root;
else else
inflate_threshold_use = inflate_threshold; inflate_threshold_use = inflate_threshold;
...@@ -584,7 +583,7 @@ static struct node *resize(struct trie *t, struct tnode *tn) ...@@ -584,7 +583,7 @@ static struct node *resize(struct trie *t, struct tnode *tn)
/* Keep root node larger */ /* Keep root node larger */
if(!tn->parent) if (!tn->parent)
halve_threshold_use = halve_threshold_root; halve_threshold_use = halve_threshold_root;
else else
halve_threshold_use = halve_threshold; halve_threshold_use = halve_threshold;
...@@ -2039,12 +2038,12 @@ static struct node *fib_trie_get_first(struct fib_trie_iter *iter, ...@@ -2039,12 +2038,12 @@ static struct node *fib_trie_get_first(struct fib_trie_iter *iter,
{ {
struct node *n ; struct node *n ;
if(!t) if (!t)
return NULL; return NULL;
n = rcu_dereference(t->trie); n = rcu_dereference(t->trie);
if(!iter) if (!iter)
return NULL; return NULL;
if (n) { if (n) {
...@@ -2084,7 +2083,7 @@ static void trie_collect_stats(struct trie *t, struct trie_stat *s) ...@@ -2084,7 +2083,7 @@ static void trie_collect_stats(struct trie *t, struct trie_stat *s)
int i; int i;
s->tnodes++; s->tnodes++;
if(tn->bits < MAX_STAT_DEPTH) if (tn->bits < MAX_STAT_DEPTH)
s->nodesizes[tn->bits]++; s->nodesizes[tn->bits]++;
for (i = 0; i < (1<<tn->bits); i++) for (i = 0; i < (1<<tn->bits); i++)
...@@ -2250,7 +2249,7 @@ static inline const char *rtn_scope(enum rt_scope_t s) ...@@ -2250,7 +2249,7 @@ static inline const char *rtn_scope(enum rt_scope_t s)
{ {
static char buf[32]; static char buf[32];
switch(s) { switch (s) {
case RT_SCOPE_UNIVERSE: return "universe"; case RT_SCOPE_UNIVERSE: return "universe";
case RT_SCOPE_SITE: return "site"; case RT_SCOPE_SITE: return "site";
case RT_SCOPE_LINK: return "link"; case RT_SCOPE_LINK: return "link";
......
...@@ -184,7 +184,7 @@ static __inline__ struct ipq *frag_alloc_queue(void) ...@@ -184,7 +184,7 @@ static __inline__ struct ipq *frag_alloc_queue(void)
{ {
struct ipq *qp = kmalloc(sizeof(struct ipq), GFP_ATOMIC); struct ipq *qp = kmalloc(sizeof(struct ipq), GFP_ATOMIC);
if(!qp) if (!qp)
return NULL; return NULL;
atomic_add(sizeof(struct ipq), &ip_frag_mem); atomic_add(sizeof(struct ipq), &ip_frag_mem);
return qp; return qp;
...@@ -321,11 +321,11 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in) ...@@ -321,11 +321,11 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in)
* promoted read lock to write lock. * promoted read lock to write lock.
*/ */
hlist_for_each_entry(qp, n, &ipq_hash[hash], list) { hlist_for_each_entry(qp, n, &ipq_hash[hash], list) {
if(qp->id == qp_in->id && if (qp->id == qp_in->id &&
qp->saddr == qp_in->saddr && qp->saddr == qp_in->saddr &&
qp->daddr == qp_in->daddr && qp->daddr == qp_in->daddr &&
qp->protocol == qp_in->protocol && qp->protocol == qp_in->protocol &&
qp->user == qp_in->user) { qp->user == qp_in->user) {
atomic_inc(&qp->refcnt); atomic_inc(&qp->refcnt);
write_unlock(&ipfrag_lock); write_unlock(&ipfrag_lock);
qp_in->last_in |= COMPLETE; qp_in->last_in |= COMPLETE;
...@@ -398,11 +398,11 @@ static inline struct ipq *ip_find(struct iphdr *iph, u32 user) ...@@ -398,11 +398,11 @@ static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
read_lock(&ipfrag_lock); read_lock(&ipfrag_lock);
hash = ipqhashfn(id, saddr, daddr, protocol); hash = ipqhashfn(id, saddr, daddr, protocol);
hlist_for_each_entry(qp, n, &ipq_hash[hash], list) { hlist_for_each_entry(qp, n, &ipq_hash[hash], list) {
if(qp->id == id && if (qp->id == id &&
qp->saddr == saddr && qp->saddr == saddr &&
qp->daddr == daddr && qp->daddr == daddr &&
qp->protocol == protocol && qp->protocol == protocol &&
qp->user == user) { qp->user == user) {
atomic_inc(&qp->refcnt); atomic_inc(&qp->refcnt);
read_unlock(&ipfrag_lock); read_unlock(&ipfrag_lock);
return qp; return qp;
...@@ -524,7 +524,7 @@ static void ip_frag_queue(struct ipq *qp, struct sk_buff *skb) ...@@ -524,7 +524,7 @@ static void ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
* this fragment, right? * this fragment, right?
*/ */
prev = NULL; prev = NULL;
for(next = qp->fragments; next != NULL; next = next->next) { for (next = qp->fragments; next != NULL; next = next->next) {
if (FRAG_CB(next)->offset >= offset) if (FRAG_CB(next)->offset >= offset)
break; /* bingo! */ break; /* bingo! */
prev = next; prev = next;
...@@ -627,7 +627,7 @@ static struct sk_buff *ip_frag_reasm(struct ipq *qp, struct net_device *dev) ...@@ -627,7 +627,7 @@ static struct sk_buff *ip_frag_reasm(struct ipq *qp, struct net_device *dev)
ihlen = head->nh.iph->ihl*4; ihlen = head->nh.iph->ihl*4;
len = ihlen + qp->len; len = ihlen + qp->len;
if(len > 65535) if (len > 65535)
goto out_oversize; goto out_oversize;
/* Head of list must not be cloned. */ /* Head of list must not be cloned. */
......
...@@ -566,7 +566,7 @@ slow_path: ...@@ -566,7 +566,7 @@ slow_path:
* Keep copying data until we run out. * Keep copying data until we run out.
*/ */
while(left > 0) { while (left > 0) {
len = left; len = left;
/* IF: it doesn't fit, use 'mtu' - the data space left */ /* IF: it doesn't fit, use 'mtu' - the data space left */
if (len > mtu) if (len > mtu)
......
This diff is collapsed.
...@@ -782,7 +782,7 @@ static void __init ic_do_bootp_ext(u8 *ext) ...@@ -782,7 +782,7 @@ static void __init ic_do_bootp_ext(u8 *ext)
u8 *c; u8 *c;
printk("DHCP/BOOTP: Got extension %d:",*ext); printk("DHCP/BOOTP: Got extension %d:",*ext);
for(c=ext+2; c<ext+2+ext[1]; c++) for (c=ext+2; c<ext+2+ext[1]; c++)
printk(" %02x", *c); printk(" %02x", *c);
printk("\n"); printk("\n");
#endif #endif
...@@ -1094,7 +1094,7 @@ static int __init ic_dynamic(void) ...@@ -1094,7 +1094,7 @@ static int __init ic_dynamic(void)
retries = CONF_SEND_RETRIES; retries = CONF_SEND_RETRIES;
get_random_bytes(&timeout, sizeof(timeout)); get_random_bytes(&timeout, sizeof(timeout));
timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned) CONF_TIMEOUT_RANDOM); timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned) CONF_TIMEOUT_RANDOM);
for(;;) { for (;;) {
#ifdef IPCONFIG_BOOTP #ifdef IPCONFIG_BOOTP
if (do_bootp && (d->able & IC_BOOTP)) if (do_bootp && (d->able & IC_BOOTP))
ic_bootp_send_if(d, jiffies - start_jiffies); ic_bootp_send_if(d, jiffies - start_jiffies);
......
This diff is collapsed.
...@@ -93,7 +93,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -93,7 +93,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
struct iphdr *iph = skb->nh.iph; struct iphdr *iph = skb->nh.iph;
int err = -EINVAL; int err = -EINVAL;
switch(iph->protocol){ switch (iph->protocol){
case IPPROTO_IPIP: case IPPROTO_IPIP:
break; break;
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
......
...@@ -119,7 +119,7 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int ...@@ -119,7 +119,7 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
if (xfrm[i]->props.mode == XFRM_MODE_TUNNEL) { if (xfrm[i]->props.mode == XFRM_MODE_TUNNEL) {
unsigned short encap_family = xfrm[i]->props.family; unsigned short encap_family = xfrm[i]->props.family;
switch(encap_family) { switch (encap_family) {
case AF_INET: case AF_INET:
fl_tunnel.fl4_dst = xfrm[i]->id.daddr.a4; fl_tunnel.fl4_dst = xfrm[i]->id.daddr.a4;
fl_tunnel.fl4_src = xfrm[i]->props.saddr.a4; fl_tunnel.fl4_src = xfrm[i]->props.saddr.a4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment