Commit bdcca44e authored by Vatsala Narang's avatar Vatsala Narang Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: ieee80211: Use !x in place of NULL comparison 



Change NULL comparison to Boolean negation.Issue found using Coccinelle

Semantic patch used to solve the problem is as follows:

@replace_rule@
expression e;
@@

- e == NULL
+ !e

Signed-off-by: default avatarVatsala Narang <vatsalanarang@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e1a0d11

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c

+6 −7
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, 
	struct rtl_80211_hdr_4addr *hdr;

	int res, hdrlen;



	if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)

	if (!crypt || !crypt->ops->decrypt_mpdu)

		return 0;

	if (ieee->hwsec_active)

	{
@@ -388,7 +388,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, struct sk_buff *s 
	struct rtl_80211_hdr_4addr *hdr;

	int res, hdrlen;



	if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)

	if (!crypt || !crypt->ops->decrypt_msdu)

		return 0;

	if (ieee->hwsec_active)

	{
@@ -982,8 +982,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 


		/* allow NULL decrypt to indicate an station specific override

		 * for default encryption */

		if (crypt && (crypt->ops == NULL ||

			      crypt->ops->decrypt_mpdu == NULL))

		if (crypt && (!crypt->ops || !crypt->ops->decrypt_mpdu))

			crypt = NULL;



		if (!crypt && (fc & IEEE80211_FCTL_WEP)) {
@@ -1284,7 +1283,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
	}



//added by amy for reorder

	if (!ieee->pHTInfo->bCurRxReorderEnable || pTS == NULL){

	if (!ieee->pHTInfo->bCurRxReorderEnable || !pTS) {

//added by amy for reorder

		for(i = 0; i<rxb->nr_subframes; i++) {

			struct sk_buff *sub_skb = rxb->subframes[i];
@@ -1420,9 +1419,9 @@ static int ieee80211_read_qos_info_element(struct 
	int ret = 0;

	u16 size = sizeof(struct ieee80211_qos_information_element) - 2;



	if (element_info == NULL)

	if (!element_info)

		return -1;

	if (info_element == NULL)

	if (!info_element)

		return -1;



	if ((info_element->id == QOS_ELEMENT_ID) && (info_element->len == size)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE