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

Commit 0953a2e3 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: wilc_frmw_to_linux(): fixes null check 



Null checking wilc_netdev and skb->dev are already done in the begining of the
function and they are just print printing error log, so delete them.
Null checking wilc is needed before is used so add null ckeck before it is
used.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4cf93d70

drivers/staging/wilc1000/linux_wlan.c

+3 −6
Original line number Diff line number Diff line
@@ -1322,6 +1322,9 @@ void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset) 
	struct net_device *wilc_netdev;

	struct wilc_vif *vif;



	if (!wilc)

		return;



	wilc_netdev = get_if_handler(wilc, buff);

	if (!wilc_netdev)

		return;
@@ -1338,14 +1341,8 @@ void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset) 
			PRINT_ER("Low memory - packet droped\n");

			return;

		}



		if (!wilc || !wilc_netdev)

			PRINT_ER("wilc_netdev in wilc is NULL");

		skb->dev = wilc_netdev;



		if (!skb->dev)

			PRINT_ER("skb->dev is NULL\n");



		memcpy(skb_put(skb, frame_len), buff_to_send, frame_len);



		skb->protocol = eth_type_trans(skb, wilc_netdev);