Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/atm/clip.c: checkpatch cleanups

Browse source 
Convert #include <asm... to #include <linux...
Spacing cleanups
Move labels to column 1
Move logical continuation tests to end of previous line

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-01-26 11:40:05 +00:00 • committed by David S. Miller
parent 641d729eb6
commit e956ea1b7d
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
net/atm/clip.c
View file

@ -32,10 +32,10 @@
#include <linux/jhash.h> #include <linux/jhash.h>
#include <net/route.h> /* for struct rtable and routing */ #include <net/route.h> /* for struct rtable and routing */
#include <net/icmp.h> /* icmp_send */ #include <net/icmp.h> /* icmp_send */
#include <asm/param.h> /* for HZ */ #include <linux/param.h> /* for HZ */
#include <linux/uaccess.h>
#include <asm/byteorder.h> /* for htons etc. */ #include <asm/byteorder.h> /* for htons etc. */
#include <asm/system.h> /* save/restore_flags */ #include <asm/system.h> /* save/restore_flags */
#include <asm/uaccess.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include "common.h" #include "common.h"
@ -56,10 +56,10 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)
pr_debug("(%d)\n", type); pr_debug("(%d)\n", type);
if (!atmarpd) if (!atmarpd)
return -EUNATCH; return -EUNATCH;
skb = alloc_skb(sizeof(struct atmarp_ctrl),GFP_ATOMIC); skb = alloc_skb(sizeof(struct atmarp_ctrl), GFP_ATOMIC);
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
ctrl = (struct atmarp_ctrl *) skb_put(skb,sizeof(struct atmarp_ctrl)); ctrl = (struct atmarp_ctrl *)skb_put(skb, sizeof(struct atmarp_ctrl));
ctrl->type = type; ctrl->type = type;
ctrl->itf_num = itf; ctrl->itf_num = itf;
ctrl->ip = ip; ctrl->ip = ip;
@ -111,7 +111,7 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
goto out; goto out;
} }
pr_crit("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc); pr_crit("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);
out: out:
netif_tx_unlock_bh(entry->neigh->dev); netif_tx_unlock_bh(entry->neigh->dev);
} }
@ -205,12 +205,12 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
} }
ATM_SKB(skb)->vcc = vcc; ATM_SKB(skb)->vcc = vcc;
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
if (!clip_vcc->encap if (!clip_vcc->encap ||
|| skb->len < RFC1483LLC_LEN skb->len < RFC1483LLC_LEN ||
|| memcmp(skb->data, llc_oui, sizeof (llc_oui))) memcmp(skb->data, llc_oui, sizeof(llc_oui)))
skb->protocol = htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
else { else {
skb->protocol = ((__be16 *) skb->data)[3]; skb->protocol = ((__be16 *)skb->data)[3];
skb_pull(skb, RFC1483LLC_LEN); skb_pull(skb, RFC1483LLC_LEN);
if (skb->protocol == htons(ETH_P_ARP)) { if (skb->protocol == htons(ETH_P_ARP)) {
skb->dev->stats.rx_packets++; skb->dev->stats.rx_packets++;
@ -644,7 +644,6 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
return clip_device_event(this, NETDEV_CHANGE, in_dev->dev); return clip_device_event(this, NETDEV_CHANGE, in_dev->dev);
} }
static struct notifier_block clip_dev_notifier = { static struct notifier_block clip_dev_notifier = {
.notifier_call = clip_device_event, .notifier_call = clip_device_event,
}; };
@ -670,7 +669,6 @@ static void atmarpd_close(struct atm_vcc *vcc)
module_put(THIS_MODULE); module_put(THIS_MODULE);
} }
static struct atmdev_ops atmarpd_dev_ops = { static struct atmdev_ops atmarpd_dev_ops = {
.close = atmarpd_close .close = atmarpd_close
}; };
@ -692,11 +690,11 @@ static int atm_init_atmarp(struct atm_vcc *vcc)
return -EADDRINUSE; return -EADDRINUSE;
} }
mod_timer(&idle_timer, jiffies+CLIP_CHECK_INTERVAL*HZ); mod_timer(&idle_timer, jiffies + CLIP_CHECK_INTERVAL * HZ);
atmarpd = vcc; atmarpd = vcc;
set_bit(ATM_VF_META,&vcc->flags); set_bit(ATM_VF_META, &vcc->flags);
set_bit(ATM_VF_READY,&vcc->flags); set_bit(ATM_VF_READY, &vcc->flags);
/* allow replies and avoid getting closed if signaling dies */ /* allow replies and avoid getting closed if signaling dies */
vcc->dev = &atmarpd_dev; vcc->dev = &atmarpd_dev;
vcc_insert_socket(sk_atm(vcc)); vcc_insert_socket(sk_atm(vcc));