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

Commit 02a29d2d authored by Tapasweni Pathak's avatar Tapasweni Pathak Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: add new line after declarations 



This patch fixes checkpatch.pl warning in hal_init.c file
WARNING : Missing a blank line after declarations

Signed-off-by: default avatarTapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be075eb6

drivers/staging/rtl8712/rtl8712_cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ int r8712_cmd_thread(void *context) 
			struct dvobj_priv *pdvobj = (struct dvobj_priv *)

						    &padapter->dvobjpriv;

			u8 blnPending = 0;



			pcmdpriv->cmd_issued_cnt++;

			cmdsz = round_up(pcmd->cmdsz, 8);

			wr_sz = TXDESC_SIZE + 8 + cmdsz;

drivers/staging/rtl8712/rtl8712_io.c

+2 −1
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ void r8712_write16(struct _adapter *adapter, u32 addr, u16 val) 
{

	struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;

	struct intf_hdl *pintfhdl = &(pio_queue->intf);



	void (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);



	_write16 = pintfhdl->io_ops._write16;

	_write16(pintfhdl, addr, val);

}
@@ -90,6 +90,7 @@ void r8712_write32(struct _adapter *adapter, u32 addr, u32 val) 
	struct intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_queue->intf));



	void (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val);



	_write32 = pintfhdl->io_ops._write32;

	_write32(pintfhdl, addr, val);

}

drivers/staging/rtl8712/rtl8712_xmit.c

+3 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ u8 r8712_append_mpdu_unit(struct xmit_buf *pxmitbuf, 
	padding_sz = (8 - (last_txcmdsz % 8));

	if ((last_txcmdsz % 8) != 0) {

		int i;



		for (i = 0; i < padding_sz; i++)

			*(pxmitframe->buf_addr+TXDESC_SIZE+last_txcmdsz+i) = 0;

	}
@@ -554,6 +555,7 @@ static void update_txdesc(struct xmit_frame *pxmitframe, uint *pmem, int sz) 
		}

		if (pattrib->pctrl == 1) { /* mp tx packets */

			struct tx_desc *ptxdesc_mp;



			ptxdesc_mp = &txdesc_mp;

			/* offset 8 */

			ptxdesc->txdw2 = cpu_to_le32(ptxdesc_mp->txdw2);
@@ -655,6 +657,7 @@ int r8712_xmitframe_complete(struct _adapter *padapter, 
		r8712_xmitframe_aggr_1st(pxmitbuf, pxmitframe);

		if (p2ndxmitframe != NULL) {

			u16 total_length;



			total_length = r8712_xmitframe_aggr_next(

				pxmitbuf, p2ndxmitframe);

			do {

drivers/staging/rtl8712/rtl871x_io.h

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ struct io_queue { 
static inline u32 _RND4(u32 sz)

{

	u32	val;



	val = ((sz >> 2) + ((sz & 3) ? 1 : 0)) << 2;

	return val;

}

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+8 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ static inline char *translate_scan(struct _adapter *padapter, 
	{

		/*  check legal index */

		u8 dsconfig = pnetwork->network.Configuration.DSConfig;



		if (dsconfig >= 1 && dsconfig <= sizeof(

		    ieee80211_wlan_frequencies) / sizeof(long))

			iwe.u.freq.m = (s32)(ieee80211_wlan_frequencies[
@@ -287,6 +288,7 @@ static inline char *translate_scan(struct _adapter *padapter, 
		u16 wpa_len = 0, rsn_len = 0;

		int n;

		sint out_len = 0;



		out_len = r8712_get_sec_ie(pnetwork->network.IEs,

					   pnetwork->network.

					   IELength, rsn_ie, &rsn_len,
@@ -697,6 +699,7 @@ static int r8711_wx_set_freq(struct net_device *dev, 
	  (fwrq->m <= (int) 2.487e8)) {

		int f = fwrq->m / 100000;

		int c = 0;



		while ((c < 14) && (f != frequency_list[c]))

			c++;

		fwrq->e = 0;
@@ -707,6 +710,7 @@ static int r8711_wx_set_freq(struct net_device *dev, 
		rc = -EOPNOTSUPP;

	else {

		int channel = fwrq->m;



		if ((channel < 1) || (channel > 14))

			rc = -EINVAL;

		else {
@@ -999,12 +1003,14 @@ static int r871x_wx_set_priv(struct net_device *dev, 
		/*Set scan type to active */

		/*OK if successful */

		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



		pmlmepriv->passive_mode = 1;

		sprintf(ext, "OK");

	} else if (0 == strcasecmp(ext, "SCAN-PASSIVE")) {

		/*Set scan type to passive */

		/*OK if successful */

		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



		pmlmepriv->passive_mode = 0;

		sprintf(ext, "OK");

	} else if (0 == strncmp(ext, "DCE-E", 5)) {
@@ -1179,10 +1185,12 @@ static int r8711_wx_set_scan(struct net_device *dev, 
		return 0;

	if (wrqu->data.length == sizeof(struct iw_scan_req)) {

		struct iw_scan_req *req = (struct iw_scan_req *)extra;



		if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {

			struct ndis_802_11_ssid ssid;

			unsigned long irqL;

			u32 len = min_t(u8, req->essid_len, IW_ESSID_MAX_SIZE);



			memset((unsigned char *)&ssid, 0,

				 sizeof(struct ndis_802_11_ssid));

			memcpy(ssid.Ssid, req->essid, len);