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

Commit 8f896d61 authored by Xenia Ragiadakou's avatar Xenia Ragiadakou Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: fix identation in r8192U_core.c 



This patch fixes identation and alignment in r8192U_core.c.
Also, removes spaces from idents when applicable.

Signed-off-by: default avatarXenia Ragiadakou <burzalodowa@gmail.com>
Reviewed-by: default avatarDan <Carpenter&lt;dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0a60a14

drivers/staging/rtl8192u/r8192U_core.c

+659 −704
Original line number Diff line number Diff line
@@ -1619,8 +1619,7 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb) 
	if (!status) {

		return 0;

	} else {

		DMESGE("Error TX CMD URB, error %d",

				status);

		DMESGE("Error TX CMD URB, error %d", status);

		return -1;

	}

}
@@ -2997,8 +2996,7 @@ bool rtl8192_adapter_start(struct net_device *dev) 
	write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT << RSVD_FW_QUEUE_PAGE_MGNT_SHIFT |

			NUM_OF_PAGE_IN_FW_QUEUE_CMD << RSVD_FW_QUEUE_PAGE_CMD_SHIFT);

	write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW|

						NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT

						);

			NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT);

	write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));



	//Set AckTimeout
@@ -3342,51 +3340,27 @@ void CamRestoreAllEntry(struct net_device *dev) 


		for (EntryId = 0; EntryId < 4; EntryId++) {

			MacAddr = CAM_CONST_ADDR[EntryId];

				setKey(dev,

						EntryId,

						EntryId,

			setKey(dev, EntryId, EntryId,

			       priv->ieee80211->pairwise_key_type,

						MacAddr,

						0,

						NULL);

			       MacAddr, 0, NULL);

		}



	} else if (priv->ieee80211->pairwise_key_type == KEY_TYPE_TKIP) {



		if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)

				setKey(dev,

						4,

						0,

						priv->ieee80211->pairwise_key_type,

						(u8 *)dev->dev_addr,

						0,

						NULL);

			setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type,

			       (u8 *)dev->dev_addr, 0, NULL);

		else

				setKey(dev,

						4,

						0,

						priv->ieee80211->pairwise_key_type,

						MacAddr,

						0,

						NULL);

			setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type,

			       MacAddr, 0, NULL);

	} else if (priv->ieee80211->pairwise_key_type == KEY_TYPE_CCMP) {



		if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)

				setKey(dev,

						4,

						0,

						priv->ieee80211->pairwise_key_type,

						(u8 *)dev->dev_addr,

						0,

						NULL);

			setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type,

			       (u8 *)dev->dev_addr, 0, NULL);

		else

				setKey(dev,

						4,

						0,

						priv->ieee80211->pairwise_key_type,

						MacAddr,

						0,

						NULL);

			setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type,

			       MacAddr, 0, NULL);

	}
@@ -3394,42 +3368,24 @@ void CamRestoreAllEntry(struct net_device *dev) 
	if (priv->ieee80211->group_key_type == KEY_TYPE_TKIP) {

		MacAddr = CAM_CONST_BROAD;

		for (EntryId = 1; EntryId < 4; EntryId++) {

				setKey(dev,

						EntryId,

						EntryId,

			setKey(dev, EntryId, EntryId,

			       priv->ieee80211->group_key_type,

						MacAddr,

						0,

						NULL);

			       MacAddr, 0, NULL);

		}

		if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)

				setKey(dev,

						0,

						0,

						priv->ieee80211->group_key_type,

						CAM_CONST_ADDR[0],

						0,

						NULL);

			setKey(dev, 0, 0, priv->ieee80211->group_key_type,

			       CAM_CONST_ADDR[0], 0, NULL);

	} else if (priv->ieee80211->group_key_type == KEY_TYPE_CCMP) {

		MacAddr = CAM_CONST_BROAD;

		for (EntryId = 1; EntryId < 4; EntryId++) {

				setKey(dev,

						EntryId ,

						EntryId,

			setKey(dev, EntryId, EntryId,

			       priv->ieee80211->group_key_type,

						MacAddr,

						0,

						NULL);

			       MacAddr, 0, NULL);

		}



		if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)

				setKey(dev,

						0,

						0,

						priv->ieee80211->group_key_type,

						CAM_CONST_ADDR[0],

						0,

						NULL);

			setKey(dev, 0, 0, priv->ieee80211->group_key_type,

			       CAM_CONST_ADDR[0], 0, NULL);

	}

}

//////////////////////////////////////////////////////////////
@@ -3884,8 +3840,7 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
				}



				if (ieee->group_key_type) {

						setKey(dev,

						       ipw->u.crypt.idx,

					setKey(dev, ipw->u.crypt.idx,

					       ipw->u.crypt.idx,		//KeyIndex

					       ieee->group_key_type,	//KeyType

					       broadcast_addr,	//MacAddr