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

Commit 6d6163c3 authored by Jonathan Jin's avatar Jonathan Jin Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: rejoin split quoted strings 



Fix a checkpatch.pl warning regarding quoted string splits across lines.
While each join of these quoted strings results in a new checkpatch.pl
"lines over 80 characters" warning, the regained ability to grep for
these log strings in the codebase is, I would argue, well worth the
trade-off.

Signed-off-by: default avatarJonathan Jin <jjin082693@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7aa36b4b

drivers/staging/rtl8192e/rtllib_rx.c

+29 −63
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ rtllib_frag_cache_find(struct rtllib_device *ieee, unsigned int seq, 
		if (entry->skb != NULL &&

		    time_after(jiffies, entry->first_frag_time + 2 * HZ)) {

			RTLLIB_DEBUG_FRAG(

				"expiring fragment cache entry "

				"seq=%u last_frag=%u\n",

				"expiring fragment cache entry seq=%u last_frag=%u\n",

				entry->seq, entry->last_frag);

			dev_kfree_skb_any(entry->skb);

			entry->skb = NULL;
@@ -188,8 +187,7 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee, 


	if (entry == NULL) {

		RTLLIB_DEBUG_FRAG(

			"could not invalidate fragment cache "

			"entry (seq=%u)\n", seq);

			"could not invalidate fragment cache entry (seq=%u)\n", seq);

		return -1;

	}
@@ -305,11 +303,9 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
	atomic_dec(&crypt->refcnt);

	if (res < 0) {

		RTLLIB_DEBUG_DROP(

			"decryption failed (SA= %pM"

			") res=%d\n", hdr->addr2, res);

			"decryption failed (SA= %pM) res=%d\n", hdr->addr2, res);

		if (res == -2)

			RTLLIB_DEBUG_DROP("Decryption failed ICV "

					     "mismatch (key %d)\n",

			RTLLIB_DEBUG_DROP("Decryption failed ICV mismatch (key %d)\n",

					     skb->data[hdrlen + 3] >> 6);

		ieee->ieee_stats.rx_discards_undecryptable++;

		return -1;
@@ -345,8 +341,7 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb, 
	res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);

	atomic_dec(&crypt->refcnt);

	if (res < 0) {

		printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"

		       " (SA= %pM keyidx=%d)\n",

		printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed (SA= %pM keyidx=%d)\n",

		       ieee->dev->name, hdr->addr2, keyidx);

		return -1;

	}
@@ -559,8 +554,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
	bool bMatchWinStart = false, bPktInBuf = false;

	unsigned long flags;



	RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Seq is %d, pTS->RxIndicateSeq"

		     " is %d, WinSize is %d\n", __func__, SeqNum,

	RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Seq is %d, pTS->RxIndicateSeq is %d, WinSize is %d\n", __func__, SeqNum,

		     pTS->RxIndicateSeq, WinSize);



	spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
@@ -600,8 +594,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
			pTS->RxIndicateSeq = SeqNum + 1 - WinSize;

		else

			pTS->RxIndicateSeq = 4095 - (WinSize - (SeqNum + 1)) + 1;

		RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Window Shift! IndicateSeq: %d,"

			     " NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum);

		RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Window Shift! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum);

	}



	/*
@@ -617,8 +610,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
	 */

	if (bMatchWinStart) {

		/* Current packet is going to be indicated.*/

		RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Packets indication!! "

				"IndicateSeq: %d, NewSeq: %d\n",

		RTLLIB_DEBUG(RTLLIB_DL_REORDER, "Packets indication!! IndicateSeq: %d, NewSeq: %d\n",

				pTS->RxIndicateSeq, SeqNum);

		ieee->prxbIndicateArray[0] = prxb;

		index = 1;
@@ -636,9 +628,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 


			if (!AddReorderEntry(pTS, pReorderEntry)) {

				RTLLIB_DEBUG(RTLLIB_DL_REORDER,

					     "%s(): Duplicate packet is "

					     "dropped!! IndicateSeq: %d, "

					     "NewSeq: %d\n",

					     "%s(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n",

					    __func__, pTS->RxIndicateSeq,

					    SeqNum);

				list_add_tail(&pReorderEntry->List,
@@ -652,8 +642,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
				}

			} else {

				RTLLIB_DEBUG(RTLLIB_DL_REORDER,

					 "Pkt insert into struct buffer!! "

					 "IndicateSeq: %d, NewSeq: %d\n",

					 "Pkt insert into struct buffer!! IndicateSeq: %d, NewSeq: %d\n",

					 pTS->RxIndicateSeq, SeqNum);

			}

		} else {
@@ -663,9 +652,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
			 * indicate all the packets in struct buffer and get

			 * reorder entries.

			 */

			RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket():"

				     " There is no reorder entry!! Packet is "

				     "dropped!!\n");

			RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket(): There is no reorder entry!! Packet is dropped!!\n");

			{

				int i;
@@ -687,8 +674,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
				SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) {

			/* This protect struct buffer from overflow. */

			if (index >= REORDER_WIN_SIZE) {

				RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicate"

					     "Packet(): Buffer overflow!!\n");

				RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket(): Buffer overflow!!\n");

				bPktInBuf = true;

				break;

			}
@@ -699,8 +685,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
				pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096;



			ieee->prxbIndicateArray[index] = pReorderEntry->prxb;

			RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Indicate SeqNum"

				     " %d!\n", __func__, pReorderEntry->SeqNum);

			RTLLIB_DEBUG(RTLLIB_DL_REORDER, "%s(): Indicate SeqNum %d!\n", __func__, pReorderEntry->SeqNum);

			index++;



			list_add_tail(&pReorderEntry->List,
@@ -719,8 +704,7 @@ static void RxReorderIndicatePacket(struct rtllib_device *ieee, 
		pTS->RxTimeoutIndicateSeq = 0xffff;



		if (index > REORDER_WIN_SIZE) {

			RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket():"

				     " Rx Reorder struct buffer full!!\n");

			RTLLIB_DEBUG(RTLLIB_DL_ERR, "RxReorderIndicatePacket(): Rx Reorder struct buffer full!!\n");

			spin_unlock_irqrestore(&(ieee->reorder_spinlock),

					       flags);

			return;
@@ -809,14 +793,11 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb, 
					   (nSubframe_Length << 8);



			if (skb->len < (ETHERNET_HEADER_SIZE + nSubframe_Length)) {

				printk(KERN_INFO "%s: A-MSDU parse error!! "

				       "pRfd->nTotalSubframe : %d\n",\

				printk(KERN_INFO "%s: A-MSDU parse error!! pRfd->nTotalSubframe : %d\n",\

				       __func__, rxb->nr_subframes);

				printk(KERN_INFO "%s: A-MSDU parse error!! "

				       "Subframe Length: %d\n", __func__,

				printk(KERN_INFO "%s: A-MSDU parse error!! Subframe Length: %d\n", __func__,

				       nSubframe_Length);

				printk(KERN_INFO "nRemain_Length is %d and "

				       "nSubframe_Length is : %d\n", skb->len,

				printk(KERN_INFO "nRemain_Length is %d and nSubframe_Length is : %d\n", skb->len,

				       nSubframe_Length);

				printk(KERN_INFO "The Packet SeqNum is %d\n", SeqNum);

				return 0;
@@ -844,8 +825,7 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb, 
			sub_skb->dev = ieee->dev;

			rxb->subframes[rxb->nr_subframes++] = sub_skb;

			if (rxb->nr_subframes >= MAX_SUBFRAME_COUNT) {

				RTLLIB_DEBUG_RX("ParseSubframe(): Too many "

						"Subframes! Packets dropped!\n");

				RTLLIB_DEBUG_RX("ParseSubframe(): Too many Subframes! Packets dropped!\n");

				break;

			}

			skb_pull(skb, nSubframe_Length);
@@ -922,8 +902,7 @@ static int rtllib_rx_check_duplicate(struct rtllib_device *ieee, 
			pRxTS->RxLastFragNum = frag;

			pRxTS->RxLastSeqNum = WLAN_GET_SEQ_SEQ(sc);

		} else {

			RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR!!%s(): No TS!! Skip"

				     " the check!!\n", __func__);

			RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR!!%s(): No TS!! Skip the check!!\n", __func__);

			return -1;

		}

	}
@@ -996,9 +975,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, 
		    stype != RTLLIB_STYPE_QOS_DATA) {

			if (stype != RTLLIB_STYPE_NULLFUNC)

				RTLLIB_DEBUG_DROP(

					"RX: dropped data frame "

					"with no data (type=0x%02x, "

					"subtype=0x%02x)\n",

					"RX: dropped data frame with no data (type=0x%02x, subtype=0x%02x)\n",

					type, stype);

			return -1;

		}
@@ -1041,8 +1018,7 @@ static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb, 
			 * frames from other than current BSS, so just drop the

			 * frames silently instead of filling system log with

			 * these reports. */

			RTLLIB_DEBUG_DROP("Decryption failed (not set)"

					     " (SA= %pM)\n",

			RTLLIB_DEBUG_DROP("Decryption failed (not set) (SA= %pM)\n",

					     hdr->addr2);

			ieee->ieee_stats.rx_discards_undecryptable++;

			return -1;
@@ -1086,8 +1062,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 


		if (!frag_skb) {

			RTLLIB_DEBUG(RTLLIB_DL_RX | RTLLIB_DL_FRAG,

					"Rx cannot get skb from fragment "

					"cache (morefrag=%d seq=%u frag=%u)\n",

					"Rx cannot get skb from fragment cache (morefrag=%d seq=%u frag=%u)\n",

					(fc & RTLLIB_FCTL_MOREFRAGS) != 0,

					WLAN_GET_SEQ_SEQ(sc), frag);

			return -1;
@@ -1097,8 +1072,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
			flen -= hdrlen;



		if (frag_skb->tail + flen > frag_skb->end) {

			printk(KERN_WARNING "%s: host decrypted and "

			       "reassembled frame did not fit skb\n",

			printk(KERN_WARNING "%s: host decrypted and reassembled frame did not fit skb\n",

			       __func__);

			rtllib_frag_cache_invalidate(ieee, hdr);

			return -1;
@@ -1152,8 +1126,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
						eap_get_type(eap->type));

		} else {

			RTLLIB_DEBUG_DROP(

				"encryption configured, but RX "

				"frame not encrypted (SA= %pM)\n",

				"encryption configured, but RX frame not encrypted (SA= %pM)\n",

				hdr->addr2);

			return -1;

		}
@@ -1170,9 +1143,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, 
	if (crypt && !(fc & RTLLIB_FCTL_WEP) && !ieee->open_wep &&

	    !rtllib_is_eapol_frame(ieee, skb, hdrlen)) {

		RTLLIB_DEBUG_DROP(

			"dropped unencrypted RX data "

			"frame from %pM"

			" (drop_unencrypted=1)\n",

			"dropped unencrypted RX data frame from %pM (drop_unencrypted=1)\n",

			hdr->addr2);

		return -1;

	}
@@ -1762,9 +1733,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 


	while (length >= sizeof(*info_element)) {

		if (sizeof(*info_element) + info_element->len > length) {

			RTLLIB_DEBUG_MGMT("Info elem: parse failed: "

					     "info_element->len + 2 > left : "

					     "info_element->len+2=%zd left=%d, id=%d.\n",

			RTLLIB_DEBUG_MGMT("Info elem: parse failed: info_element->len + 2 > left : info_element->len+2=%zd left=%d, id=%d.\n",

					     info_element->len +

					     sizeof(*info_element),

					     length, info_element->id);
@@ -2321,8 +2290,7 @@ static inline int rtllib_network_init( 
	}



	if (network->mode == 0) {

		RTLLIB_DEBUG_SCAN("Filtered out '%s (%pM)' "

				     "network.\n",

		RTLLIB_DEBUG_SCAN("Filtered out '%s (%pM)' network.\n",

				     escape_essid(network->ssid,

						  network->ssid_len),

				     network->bssid);
@@ -2568,8 +2536,7 @@ static inline void rtllib_process_probe_response( 
	if (WLAN_FC_GET_STYPE(le16_to_cpu(beacon->header.frame_ctl)) ==

	    RTLLIB_STYPE_PROBE_RESP) {

		if (IsPassiveChannel(ieee, network->channel)) {

			printk(KERN_INFO "GetScanInfo(): For Global Domain, "

			       "filter probe response at channel(%d).\n",

			printk(KERN_INFO "GetScanInfo(): For Global Domain, filter probe response at channel(%d).\n",

			       network->channel);

			goto free_network;

		}
@@ -2618,8 +2585,7 @@ static inline void rtllib_process_probe_response( 
			/* If there are no more slots, expire the oldest */

			list_del(&oldest->list);

			target = oldest;

			RTLLIB_DEBUG_SCAN("Expired '%s' ( %pM) from "

					     "network list.\n",

			RTLLIB_DEBUG_SCAN("Expired '%s' ( %pM) from network list.\n",

					     escape_essid(target->ssid,

							  target->ssid_len),

					     target->bssid);