Commit 75f49e07 authored by Mithlesh Thukral's avatar Mithlesh Thukral Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: Lindent cleanups 



Lindent script cleanups in wlan-ng driver in the staging tree.
This is a item in the TODO list.

Signed-off-by: default avatarMithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1611a52c

drivers/staging/wlan-ng/hfa384x.h

+170 −206
Original line number Diff line number Diff line
@@ -887,23 +887,19 @@ typedef union hfa384x_usbin { 
PD record structures.

--------------------------------------------------------------------*/



typedef struct hfa384x_pdr_pcb_partnum

{

typedef struct hfa384x_pdr_pcb_partnum {

	u8 num[8];

} __attribute__ ((packed)) hfa384x_pdr_pcb_partnum_t;



typedef struct hfa384x_pdr_pcb_tracenum

{

typedef struct hfa384x_pdr_pcb_tracenum {

	u8 num[8];

} __attribute__ ((packed)) hfa384x_pdr_pcb_tracenum_t;



typedef struct hfa384x_pdr_nic_serial

{

typedef struct hfa384x_pdr_nic_serial {

	u8 num[12];

} __attribute__ ((packed)) hfa384x_pdr_nic_serial_t;



typedef struct hfa384x_pdr_mkk_measurements

{

typedef struct hfa384x_pdr_mkk_measurements {

	double carrier_freq;

	double occupied_band;

	double power_density;
@@ -921,170 +917,138 @@ typedef struct hfa384x_pdr_mkk_measurements 
	double rx_spur_l2;

} __attribute__ ((packed)) hfa384x_pdr_mkk_measurements_t;



typedef struct hfa384x_pdr_nic_ramsize

{

typedef struct hfa384x_pdr_nic_ramsize {

	u8 size[12];		/* units of KB */

} __attribute__ ((packed)) hfa384x_pdr_nic_ramsize_t;



typedef struct hfa384x_pdr_mfisuprange

{

typedef struct hfa384x_pdr_mfisuprange {

	u16 id;

	u16 variant;

	u16 bottom;

	u16 top;

} __attribute__ ((packed)) hfa384x_pdr_mfisuprange_t;



typedef struct hfa384x_pdr_cfisuprange

{

typedef struct hfa384x_pdr_cfisuprange {

	u16 id;

	u16 variant;

	u16 bottom;

	u16 top;

} __attribute__ ((packed)) hfa384x_pdr_cfisuprange_t;



typedef struct hfa384x_pdr_nicid

{

typedef struct hfa384x_pdr_nicid {

	u16 id;

	u16 variant;

	u16 major;

	u16 minor;

} __attribute__ ((packed)) hfa384x_pdr_nicid_t;





typedef struct hfa384x_pdr_refdac_measurements

{

typedef struct hfa384x_pdr_refdac_measurements {

	u16 value[0];

} __attribute__ ((packed)) hfa384x_pdr_refdac_measurements_t;



typedef struct hfa384x_pdr_vgdac_measurements

{

typedef struct hfa384x_pdr_vgdac_measurements {

	u16 value[0];

} __attribute__ ((packed)) hfa384x_pdr_vgdac_measurements_t;



typedef struct hfa384x_pdr_level_comp_measurements

{

typedef struct hfa384x_pdr_level_comp_measurements {

	u16 value[0];

} __attribute__ ((packed)) hfa384x_pdr_level_compc_measurements_t;



typedef struct hfa384x_pdr_mac_address

{

typedef struct hfa384x_pdr_mac_address {

	u8 addr[6];

} __attribute__ ((packed)) hfa384x_pdr_mac_address_t;



typedef struct hfa384x_pdr_mkk_callname

{

typedef struct hfa384x_pdr_mkk_callname {

	u8 callname[8];

} __attribute__ ((packed)) hfa384x_pdr_mkk_callname_t;



typedef struct hfa384x_pdr_regdomain

{

typedef struct hfa384x_pdr_regdomain {

	u16 numdomains;

	u16 domain[5];

} __attribute__ ((packed)) hfa384x_pdr_regdomain_t;



typedef struct hfa384x_pdr_allowed_channel

{

typedef struct hfa384x_pdr_allowed_channel {

	u16 ch_bitmap;

} __attribute__ ((packed)) hfa384x_pdr_allowed_channel_t;



typedef struct hfa384x_pdr_default_channel

{

typedef struct hfa384x_pdr_default_channel {

	u16 channel;

} __attribute__ ((packed)) hfa384x_pdr_default_channel_t;



typedef struct hfa384x_pdr_privacy_option

{

typedef struct hfa384x_pdr_privacy_option {

	u16 available;

} __attribute__ ((packed)) hfa384x_pdr_privacy_option_t;



typedef struct hfa384x_pdr_temptype

{

typedef struct hfa384x_pdr_temptype {

	u16 type;

} __attribute__ ((packed)) hfa384x_pdr_temptype_t;



typedef struct hfa384x_pdr_refdac_setup

{

typedef struct hfa384x_pdr_refdac_setup {

	u16 ch_value[14];

} __attribute__ ((packed)) hfa384x_pdr_refdac_setup_t;



typedef struct hfa384x_pdr_vgdac_setup

{

typedef struct hfa384x_pdr_vgdac_setup {

	u16 ch_value[14];

} __attribute__ ((packed)) hfa384x_pdr_vgdac_setup_t;



typedef struct hfa384x_pdr_level_comp_setup

{

typedef struct hfa384x_pdr_level_comp_setup {

	u16 ch_value[14];

} __attribute__ ((packed)) hfa384x_pdr_level_comp_setup_t;



typedef struct hfa384x_pdr_trimdac_setup

{

typedef struct hfa384x_pdr_trimdac_setup {

	u16 trimidac;

	u16 trimqdac;

} __attribute__ ((packed)) hfa384x_pdr_trimdac_setup_t;



typedef struct hfa384x_pdr_ifr_setting

{

typedef struct hfa384x_pdr_ifr_setting {

	u16 value[3];

} __attribute__ ((packed)) hfa384x_pdr_ifr_setting_t;



typedef struct hfa384x_pdr_rfr_setting

{

typedef struct hfa384x_pdr_rfr_setting {

	u16 value[3];

} __attribute__ ((packed)) hfa384x_pdr_rfr_setting_t;



typedef struct hfa384x_pdr_hfa3861_baseline

{

typedef struct hfa384x_pdr_hfa3861_baseline {

	u16 value[50];

} __attribute__ ((packed)) hfa384x_pdr_hfa3861_baseline_t;



typedef struct hfa384x_pdr_hfa3861_shadow

{

typedef struct hfa384x_pdr_hfa3861_shadow {

	u32 value[32];

} __attribute__ ((packed)) hfa384x_pdr_hfa3861_shadow_t;



typedef struct hfa384x_pdr_hfa3861_ifrf

{

typedef struct hfa384x_pdr_hfa3861_ifrf {

	u32 value[20];

} __attribute__ ((packed)) hfa384x_pdr_hfa3861_ifrf_t;



typedef struct hfa384x_pdr_hfa3861_chcalsp

{

typedef struct hfa384x_pdr_hfa3861_chcalsp {

	u16 value[14];

} __attribute__ ((packed)) hfa384x_pdr_hfa3861_chcalsp_t;



typedef struct hfa384x_pdr_hfa3861_chcali

{

typedef struct hfa384x_pdr_hfa3861_chcali {

	u16 value[17];

} __attribute__ ((packed)) hfa384x_pdr_hfa3861_chcali_t;



typedef struct hfa384x_pdr_hfa3861_nic_config

{

typedef struct hfa384x_pdr_hfa3861_nic_config {

	u16 config_bitmap;

} __attribute__ ((packed)) hfa384x_pdr_nic_config_t;



typedef struct hfa384x_pdr_hfo_delay

{

typedef struct hfa384x_pdr_hfo_delay {

	u8 hfo_delay;

} __attribute__ ((packed)) hfa384x_hfo_delay_t;



typedef struct hfa384x_pdr_hfa3861_manf_testsp

{

typedef struct hfa384x_pdr_hfa3861_manf_testsp {

	u16 value[30];

} __attribute__ ((packed)) hfa384x_pdr_hfa3861_manf_testsp_t;



typedef struct hfa384x_pdr_hfa3861_manf_testi

{

typedef struct hfa384x_pdr_hfa3861_manf_testi {

	u16 value[30];

} __attribute__ ((packed)) hfa384x_pdr_hfa3861_manf_testi_t;



typedef struct hfa384x_end_of_pda

{

typedef struct hfa384x_end_of_pda {

	u16 crc;

} __attribute__ ((packed)) hfa384x_pdr_end_of_pda_t;



typedef struct hfa384x_pdrec

{

typedef struct hfa384x_pdrec {

	u16 len;		/* in words */

	u16 code;

	union pdr {

drivers/staging/wlan-ng/hfa384x_usb.c

+152 −170
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
* --------------------------------------------------------------------

*/





#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/sched.h>
@@ -310,14 +309,12 @@ void dbprint_urb(struct urb *urb) 
	pr_debug("urb->bandwidth=0x%08x\n", urb->bandwidth);

	pr_debug("urb->setup_packet(ctl)=0x%08x\n",

		 (unsigned int)urb->setup_packet);

	pr_debug("urb->start_frame(iso/irq)=0x%08x\n",

	       urb->start_frame);

	pr_debug("urb->start_frame(iso/irq)=0x%08x\n", urb->start_frame);

	pr_debug("urb->interval(irq)=0x%08x\n", urb->interval);

	pr_debug("urb->error_count(iso)=0x%08x\n", urb->error_count);

	pr_debug("urb->timeout=0x%08x\n", urb->timeout);

	pr_debug("urb->context=0x%08x\n", (unsigned int)urb->context);

	pr_debug("urb->complete=0x%08x\n",

	       (unsigned int)urb->complete);

	pr_debug("urb->complete=0x%08x\n", (unsigned int)urb->complete);

}

#endif
@@ -863,8 +860,7 @@ static void hfa384x_cb_rrid(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx) 


		if (ctlx->state != CTLX_COMPLETE) {

			memset(&rridresult, 0, sizeof(rridresult));

			rridresult.rid =

			    le16_to_cpu(ctlx->outbuf.rridreq.rid);

			rridresult.rid = le16_to_cpu(ctlx->outbuf.rridreq.rid);

		} else {

			usbctlx_get_rridresult(&ctlx->inbuf.rridresp,

					       &rridresult);
@@ -1174,8 +1170,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr, 
	int result = 0;

	hfa384x_metacmd_t cmd;



	pr_debug(

	       "mode=%d, lowaddr=0x%04x, highaddr=0x%04x, codelen=%d\n",

	pr_debug("mode=%d, lowaddr=0x%04x, highaddr=0x%04x, codelen=%d\n",

		 mode, lowaddr, highaddr, codelen);



	cmd.cmd = (HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_DOWNLD) |
@@ -1555,9 +1550,8 @@ hfa384x_dowrid(hfa384x_t *hw, 
	/* Initialize the command */

	ctlx->outbuf.wridreq.type = cpu_to_le16(HFA384x_USB_WRIDREQ);

	ctlx->outbuf.wridreq.frmlen = cpu_to_le16((sizeof

						       (ctlx->outbuf.wridreq.

							rid) + riddatalen +

						       1) / 2);

						   (ctlx->outbuf.wridreq.rid) +

						   riddatalen + 1) / 2);

	ctlx->outbuf.wridreq.rid = cpu_to_le16(rid);

	memcpy(ctlx->outbuf.wridreq.data, riddata, riddatalen);
@@ -1651,14 +1645,12 @@ hfa384x_dormem(hfa384x_t *hw, 


	ctlx->outbufsize = sizeof(ctlx->outbuf.rmemreq);



	pr_debug(

	       "type=0x%04x frmlen=%d offset=0x%04x page=0x%04x\n",

	pr_debug("type=0x%04x frmlen=%d offset=0x%04x page=0x%04x\n",

		 ctlx->outbuf.rmemreq.type,

		 ctlx->outbuf.rmemreq.frmlen,

		 ctlx->outbuf.rmemreq.offset, ctlx->outbuf.rmemreq.page);



	pr_debug("pktsize=%zd\n",

	       ROUNDUP64(sizeof(ctlx->outbuf.rmemreq)));

	pr_debug("pktsize=%zd\n", ROUNDUP64(sizeof(ctlx->outbuf.rmemreq)));



	ctlx->reapable = mode;

	ctlx->cmdcb = cmdcb;
@@ -1728,8 +1720,7 @@ hfa384x_dowmem(hfa384x_t *hw, 
	int result;

	hfa384x_usbctlx_t *ctlx;



	pr_debug("page=0x%04x offset=0x%04x len=%d\n",

	       page, offset, len);

	pr_debug("page=0x%04x offset=0x%04x len=%d\n", page, offset, len);



	ctlx = usbctlx_alloc();

	if (ctlx == NULL) {
@@ -2035,8 +2026,7 @@ int hfa384x_drvr_flashdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len) 
	/* NOTE: dlbuffer RID stores the address in AUX format */

	dlbufaddr =

	    HFA384x_ADDR_AUX_MKFLAT(hw->bufinfo.page, hw->bufinfo.offset);

	pr_debug(

	       "dlbuf.page=0x%04x dlbuf.offset=0x%04x dlbufaddr=0x%08x\n",

	pr_debug("dlbuf.page=0x%04x dlbuf.offset=0x%04x dlbufaddr=0x%08x\n",

		 hw->bufinfo.page, hw->bufinfo.offset, dlbufaddr);



#if 0
@@ -2323,8 +2313,7 @@ int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr) 
		/* Set the download state */

		hw->dlstate = HFA384x_DLSTATE_RAMENABLED;

	} else {

		pr_debug(

		       "cmd_download(0x%04x, 0x%04x) failed, result=%d.\n",

		pr_debug("cmd_download(0x%04x, 0x%04x) failed, result=%d.\n",

			 lowaddr, hiaddr, result);

	}
@@ -2629,11 +2618,10 @@ int hfa384x_drvr_start(hfa384x_t *hw) 
			usb_kill_urb(&hw->rx_urb);

			goto done;

		} else {

			pr_debug(

			       "First cmd_initialize() failed (result %d),\n",

			pr_debug("First cmd_initialize() failed (result %d),\n",

				 result1);

			pr_debug(

			       "but second attempt succeeded. All should be ok\n");

			pr_debug

			    ("but second attempt succeeded. All should be ok\n");

		}

	} else if (result2 != 0) {

		printk(KERN_WARNING
@@ -3029,8 +3017,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx) 


	default:

		printk(KERN_ERR "CTLX[%d] not in a terminating state(%s)\n",

		       le16_to_cpu(ctlx->outbuf.type),

		       ctlxstr(ctlx->state));

		       le16_to_cpu(ctlx->outbuf.type), ctlxstr(ctlx->state));

		break;

	}			/* switch */

}
@@ -3225,8 +3212,7 @@ static void hfa384x_usbin_callback(struct urb *urb) 


	case -ENOENT:

	case -ECONNRESET:

		pr_debug("status=%d, urb explicitly unlinked.\n",

		       urb->status);

		pr_debug("status=%d, urb explicitly unlinked.\n", urb->status);

		action = ABORT;

		break;
@@ -3301,8 +3287,7 @@ static void hfa384x_usbin_callback(struct urb *urb) 
		break;



	default:

		pr_debug(

		       "Unrecognized USBIN packet, type=%x, status=%d\n",

		pr_debug("Unrecognized USBIN packet, type=%x, status=%d\n",

			 usbin->type, urb_status);

		break;

	}			/* switch */
@@ -3399,8 +3384,8 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin, 
			 * our request has been acknowledged. Odd,

			 * but our OUT URB is still alive...

			 */

			pr_debug(

			       "Causality violation: please reboot Universe, or email linux-wlan-devel@lists.linux-wlan.com\n");

			pr_debug

			    ("Causality violation: please reboot Universe, or email linux-wlan-devel@lists.linux-wlan.com\n");

			ctlx->state = CTLX_RESP_COMPLETE;

			break;
@@ -3552,8 +3537,7 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb) 
			hfa384x_int_rxmonitor(wlandev, &usbin->rxfrm);

			dev_kfree_skb(skb);

		} else {

			pr_debug(

			       "Received monitor frame: FCSerr set\n");

			pr_debug("Received monitor frame: FCSerr set\n");

		}

		break;
@@ -4171,14 +4155,12 @@ static int hfa384x_isgood_pdrcode(u16 pdrcode) 
	default:

		if (pdrcode < 0x1000) {

			/* code is OK, but we don't know exactly what it is */

			pr_debug(

			       "Encountered unknown PDR#=0x%04x, "

			pr_debug("Encountered unknown PDR#=0x%04x, "

				 "assuming it's ok.\n", pdrcode);

			return 1;

		} else {

			/* bad code */

			pr_debug(

			       "Encountered unknown PDR#=0x%04x, "

			pr_debug("Encountered unknown PDR#=0x%04x, "

				 "(>=0x1000), assuming it's bad.\n", pdrcode);

			return 0;

		}

drivers/staging/wlan-ng/p80211conv.c

+10 −11
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, 


		if ((foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,

				       skb->len,

				       (wlandev->

					hostwep & HOSTWEP_DEFAULTKEY_MASK),

				       (wlandev->hostwep &

					HOSTWEP_DEFAULTKEY_MASK),

				       p80211_wep->iv, p80211_wep->icv))) {

			printk(KERN_WARNING

			       "Host en-WEP failed, dropping frame (%d).\n",
@@ -329,8 +329,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, 
				       skb->data + payload_offset +

				       payload_length - 4))) {

			/* de-wep failed, drop skb. */

			pr_debug(

			       "Host de-WEP failed, dropping frame (%d).\n",

			pr_debug("Host de-WEP failed, dropping frame (%d).\n",

				 foo);

			wlandev->rx.decrypt_err++;

			return 2;

drivers/staging/wlan-ng/p80211hdr.h

+0 −3
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ 
/*================================================================*/

/* Project Includes */







/*================================================================*/

/* Constants */
@@ -188,7 +186,6 @@ typedef union p80211_hdr { 
	p80211_hdr_a4_t a4;

} __attribute__ ((packed)) p80211_hdr_t;





/* Frame and header length macros */



#define WLAN_CTL_FRAMELEN(fstype) (\

drivers/staging/wlan-ng/p80211meta.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
/*================================================================*/

/* Project Includes */





/*================================================================*/

/* Types */