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

Commit 840a121e authored by Kurt Kanzenbach's avatar Kurt Kanzenbach Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192u: ieee80211: fixed open brace positions 



This patch fixes the following checkpatch error:
  - ERROR: that open brace { should be on the previous line

Signed-off-by: default avatarKurt Kanzenbach <kurt@kmk-computers.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7de9728f

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c

+6 −12
Original line number Diff line number Diff line
@@ -185,8 +185,7 @@ static inline u16 Mk16_le(u16 *v) 
}





static const u16 Sbox[256] =

{

static const u16 Sbox[256] = {

	0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,

	0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,

	0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
@@ -320,8 +319,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 


	hdr = (struct rtl_80211_hdr_4addr *) skb->data;



	if (!tcb_desc->bHwSec)

	{

	if (!tcb_desc->bHwSec) {

		if (!tkey->tx_phase1_done) {

			tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,

					tkey->tx_iv32);
@@ -338,14 +336,12 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	memmove(pos, pos + 8, hdr_len);

	pos += hdr_len;



	if (tcb_desc->bHwSec)

	{

	if (tcb_desc->bHwSec) {

		*pos++ = Hi8(tkey->tx_iv16);

		*pos++ = (Hi8(tkey->tx_iv16) | 0x20) & 0x7F;

		*pos++ = Lo8(tkey->tx_iv16);

	}

	else

	{

	else {

		*pos++ = rc4key[0];

		*pos++ = rc4key[1];

		*pos++ = rc4key[2];
@@ -357,8 +353,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	*pos++ = (tkey->tx_iv32 >> 16) & 0xff;

	*pos++ = (tkey->tx_iv32 >> 24) & 0xff;



	if (!tcb_desc->bHwSec)

	{

	if (!tcb_desc->bHwSec) {

		icv = skb_put(skb, 4);

		crc = ~crc32_le(~0, pos, len);

		icv[0] = crc;
@@ -429,8 +424,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	iv32 = pos[4] | (pos[5] << 8) | (pos[6] << 16) | (pos[7] << 24);

	pos += 8;



	if (!tcb_desc->bHwSec)

	{

	if (!tcb_desc->bHwSec) {

		if (iv32 < tkey->rx_iv32 ||

		(iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) {

			if (net_ratelimit()) {