Commit 20433972 authored by mike dupuis's avatar mike dupuis Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192u: quoted strings split across lines 



This is a patch to fix up instances where quoted strings are split
across multiple lines in several instances in ieee80211_crypt_ccmp.c

Signed-off-by: default avatarMike Dupuis <mike.dupuis.0@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4dc4d225

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c

+11 −16
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ static void *ieee80211_ccmp_init(int key_idx) 


       priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tfm)) {

		printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "

		       "crypto API aes\n");

		printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate crypto API aes\n");

		priv->tfm = NULL;

		goto fail;

	}
@@ -284,23 +283,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	keyidx = pos[3];

	if (!(keyidx & (1 << 5))) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "CCMP: received packet without ExtIV"

			       " flag from %pM\n", hdr->addr2);

			printk(KERN_DEBUG "CCMP: received packet without ExtIV flag from %pM\n",

				hdr->addr2);

		}

		key->dot11RSNAStatsCCMPFormatErrors++;

		return -2;

	}

	keyidx >>= 6;

	if (key->key_idx != keyidx) {

		printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame "

		       "keyidx=%d priv=%p\n", key->key_idx, keyidx, priv);

		printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",

			key->key_idx, keyidx, priv);

		return -6;

	}

	if (!key->key_set) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "CCMP: received packet from %pM"

			       " with keyid=%d that does not have a configured"

			       " key\n", hdr->addr2, keyidx);

			printk(KERN_DEBUG "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",

				hdr->addr2, keyidx);

		}

		return -3;

	}
@@ -315,8 +313,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 


	if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {

		if (net_ratelimit()) {

			printk(KERN_DEBUG "CCMP: replay detected: STA=%pM"

			       " previous PN %pm received PN %pm\n",

			printk(KERN_DEBUG "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",

			       hdr->addr2, key->rx_pn, pn);

		}

		key->dot11RSNAStatsCCMPReplays++;
@@ -353,8 +350,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 


		if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {

			if (net_ratelimit()) {

				printk(KERN_DEBUG "CCMP: decrypt failed: STA="

				"%pM\n", hdr->addr2);

				printk(KERN_DEBUG "CCMP: decrypt failed: STA=%pM\n",

					hdr->addr2);

			}

			key->dot11RSNAStatsCCMPDecryptErrors++;

			return -5;
@@ -429,9 +426,7 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv) 
static char *ieee80211_ccmp_print_stats(char *p, void *priv)

{

	struct ieee80211_ccmp_data *ccmp = priv;

	p += sprintf(p, "key[%d] alg=CCMP key_set=%d "

		     "tx_pn=%pm rx_pn=%pm "

		     "format_errors=%d replays=%d decrypt_errors=%d\n",

	p += sprintf(p, "key[%d] alg=CCMP key_set=%d tx_pn=%pm rx_pn=%pm format_errors=%d replays=%d decrypt_errors=%d\n",

		     ccmp->key_idx, ccmp->key_set,

		     ccmp->tx_pn, ccmp->rx_pn,

		     ccmp->dot11RSNAStatsCCMPFormatErrors,