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

Commit f0e3a32d authored by Lior David's avatar Lior David Committed by Maya Erez
Browse files

wil6210: clean ioctl debug message 



Fix a debug message related to IOCTL that was incorrectly logged
with the MISC category, and move it inside wil_ioctl so it will
always be logged even if we call wil_ioctl from other places.

Change-Id: I3cf69b18f195e5db01a1f5832013342c9f481286
Signed-off-by: default avatarLior David <qca_liord@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
Git-commit: 6777e71ca91ea488488362a919900488e0ade3f2
Git-repo: https://github.com/kvalo/ath.git


CRs-Fixed: 982931
[merez@codeaurora.org: fixed conflict due to android private ioctl]
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
parent be6114f8

drivers/net/wireless/ath/wil6210/ioctl.c

+11 −3
Original line number Diff line number Diff line
@@ -215,15 +215,23 @@ out_free: 
}

int wil_ioctl(struct wil6210_priv *wil, void __user *data, int cmd)

{

	int ret;



	switch (cmd) {

	case WIL_IOCTL_MEMIO:

		return wil_ioc_memio_dword(wil, data);

		ret = wil_ioc_memio_dword(wil, data);

		break;

	case WIL_IOCTL_MEMIO_BLOCK:

		return wil_ioc_memio_block(wil, data);

		ret = wil_ioc_memio_block(wil, data);

		break;

	case (SIOCDEVPRIVATE + 1):

		return wil_ioc_android(wil, data);

		ret = wil_ioc_android(wil, data);

		break;

	default:

		wil_dbg_ioctl(wil, "Unsupported IOCTL 0x%04x\n", cmd);

		return -ENOIOCTLCMD;

	}



	wil_dbg_ioctl(wil, "ioctl(0x%04x) -> %d\n", cmd, ret);

	return ret;

}

drivers/net/wireless/ath/wil6210/netdev.c

+1 −5
Original line number Diff line number Diff line
@@ -60,11 +60,7 @@ static int wil_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd) 
{

	struct wil6210_priv *wil = ndev_to_wil(ndev);



	int ret = wil_ioctl(wil, ifr->ifr_data, cmd);



	wil_dbg_misc(wil, "ioctl(0x%04x) -> %d\n", cmd, ret);



	return ret;

	return wil_ioctl(wil, ifr->ifr_data, cmd);

}



static const struct net_device_ops wil_netdev_ops = {