lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

12
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"
@@ -205,9 +205,9 @@ 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];
@@ -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
}; };