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

Commit cfd01356 authored by Dave Jones's avatar Dave Jones Committed by Greg Kroah-Hartman
Browse files

staging/bcm: move IOCTL_BCM_SET_MAC_TRACING case out to its own function. 



bcm_char_ioctl is one of the longest non-generated functions in the kernel,
at 1906 lines.  Splitting it up into multiple functions should simplify
this a lot.

Signed-off-by: default avatarDave Jones <davej@fedoraproject.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c434f8e

drivers/staging/bcm/Bcmchar.c

+24 −16
Original line number Diff line number Diff line
@@ -1057,6 +1057,27 @@ static int bcm_char_ioctl_get_current_status(void __user *argp, struct bcm_mini_ 
}





static int bcm_char_ioctl_set_mac_tracing(void __user *argp, struct bcm_mini_adapter *Adapter)

{

	struct bcm_ioctl_buffer IoBuffer;

	UINT tracing_flag;



	/* copy ioctl Buffer structure */

	if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))

		return -EFAULT;



	if (copy_from_user(&tracing_flag, IoBuffer.InputBuffer, sizeof(UINT)))

		return -EFAULT;



	if (tracing_flag)

		Adapter->pTarangs->MacTracingEnabled = TRUE;

	else

		Adapter->pTarangs->MacTracingEnabled = false;



	return STATUS_SUCCESS;

}





static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)

{

	struct bcm_tarang_data *pTarang = filp->private_data;
@@ -1210,22 +1231,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		Status = bcm_char_ioctl_get_current_status(argp, Adapter);

		return Status;



	case IOCTL_BCM_SET_MAC_TRACING: {

		UINT  tracing_flag;



		/* copy ioctl Buffer structure */

		if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))

			return -EFAULT;



		if (copy_from_user(&tracing_flag, IoBuffer.InputBuffer, sizeof(UINT)))

			return -EFAULT;



		if (tracing_flag)

			Adapter->pTarangs->MacTracingEnabled = TRUE;

		else

			Adapter->pTarangs->MacTracingEnabled = false;

		break;

	}

	case IOCTL_BCM_SET_MAC_TRACING:

		Status = bcm_char_ioctl_set_mac_tracing(argp, Adapter);

		return Status;



	case IOCTL_BCM_GET_DSX_INDICATION: {

		ULONG ulSFId = 0;