Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 641d729e authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net/atm/br2684.c: checkpatch cleanups 



Convert #include <asm... to #include <linux...
Use print_hex_dump
Spacing cleanups
Move logical continuation tests to end of previous line
80 column wrapping
Move goto branch label to column 1
Remove unnecessary single statement braces

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0a6cb11

net/atm/br2684.c

+31 −41
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/etherdevice.h>

#include <linux/rtnetlink.h>

#include <linux/ip.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <net/arp.h>

#include <linux/atm.h>

#include <linux/atmdev.h>
@@ -28,20 +28,14 @@ 


#include "common.h"



#ifdef SKB_DEBUG

static void skb_debug(const struct sk_buff *skb)

{

#ifdef SKB_DEBUG

#define NUM2PRINT 50

	char buf[NUM2PRINT * 3 + 1];	/* 3 chars per byte */

	int i = 0;

	for (i = 0; i < skb->len && i < NUM2PRINT; i++) {

		sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);

	}

	printk(KERN_DEBUG "br2684: skb: %s\n", buf);

}

#else

#define skb_debug(skb)	do {} while (0)

	print_hex_dump(KERN_DEBUG, "br2684: skb: ", DUMP_OFFSET,

		       16, 1, skb->data, min(NUM2PRINT, skb->len), true);

#endif

}



#define BR2684_ETHERTYPE_LEN	2

#define BR2684_PAD_LEN		2
@@ -302,7 +296,8 @@ static int br2684_setfilt(struct atm_vcc *atmvcc, void __user * arg) 
		struct br2684_dev *brdev;

		read_lock(&devs_lock);

		brdev = BRPRIV(br2684_find_dev(&fs.ifspec));

		if (brdev == NULL || list_empty(&brdev->brvccs) || brdev->brvccs.next != brdev->brvccs.prev)	/* >1 VCC */

		if (brdev == NULL || list_empty(&brdev->brvccs) ||

		    brdev->brvccs.next != brdev->brvccs.prev)	/* >1 VCC */

			brvcc = NULL;

		else

			brvcc = list_entry_brvcc(brdev->brvccs.next);
@@ -378,17 +373,13 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) 
			__skb_trim(skb, skb->len - 4);



		/* accept packets that have "ipv[46]" in the snap header */

		if ((skb->len >= (sizeof(llc_oui_ipv4)))

		    &&

		    (memcmp

		     (skb->data, llc_oui_ipv4,

		if ((skb->len >= (sizeof(llc_oui_ipv4))) &&

		    (memcmp(skb->data, llc_oui_ipv4,

			    sizeof(llc_oui_ipv4) - BR2684_ETHERTYPE_LEN) == 0)) {

			if (memcmp

			    (skb->data + 6, ethertype_ipv6,

			if (memcmp(skb->data + 6, ethertype_ipv6,

				   sizeof(ethertype_ipv6)) == 0)

				skb->protocol = htons(ETH_P_IPV6);

			else if (memcmp

				 (skb->data + 6, ethertype_ipv4,

			else if (memcmp(skb->data + 6, ethertype_ipv4,

					sizeof(ethertype_ipv4)) == 0)

				skb->protocol = htons(ETH_P_IP);

			else
@@ -495,12 +486,12 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) 
		err = -EEXIST;

		goto error;

	}

	if (be.fcs_in != BR2684_FCSIN_NO || be.fcs_out != BR2684_FCSOUT_NO ||

	    be.fcs_auto || be.has_vpiid || be.send_padding || (be.encaps !=

							       BR2684_ENCAPS_VC

							       && be.encaps !=

							       BR2684_ENCAPS_LLC)

	    || be.min_size != 0) {

	if (be.fcs_in != BR2684_FCSIN_NO ||

	    be.fcs_out != BR2684_FCSOUT_NO ||

	    be.fcs_auto || be.has_vpiid || be.send_padding ||

	    (be.encaps != BR2684_ENCAPS_VC &&

	     be.encaps != BR2684_ENCAPS_LLC) ||

	    be.min_size != 0) {

		err = -EINVAL;

		goto error;

	}
@@ -541,6 +532,7 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) 
	}

	__module_get(THIS_MODULE);

	return 0;



error:

	write_unlock_irq(&devs_lock);

	kfree(brvcc);
@@ -597,9 +589,8 @@ static int br2684_create(void __user * arg) 


	pr_debug("\n");



	if (copy_from_user(&ni, arg, sizeof ni)) {

	if (copy_from_user(&ni, arg, sizeof ni))

		return -EFAULT;

	}



	if (ni.media & BR2684_FLAG_ROUTED)

		payload = p_routed;
@@ -607,9 +598,8 @@ static int br2684_create(void __user * arg) 
		payload = p_bridged;

	ni.media &= 0xffff;	/* strip flags */



	if (ni.media != BR2684_MEDIA_ETHERNET || ni.mtu != 1500) {

	if (ni.media != BR2684_MEDIA_ETHERNET || ni.mtu != 1500)

		return -EINVAL;

	}



	netdev = alloc_netdev(sizeof(struct br2684_dev),

			      ni.ifname[0] ? ni.ifname : "nas%d",