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

Commit cef6e912 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by John W. Linville
Browse files

rndis_wlan: move copy of module parameters to separate function 



Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent da2fb4e9

drivers/net/wireless/rndis_wlan.c

+22 −15
Original line number Diff line number Diff line
@@ -2594,23 +2594,9 @@ static void rndis_device_poller(struct work_struct *work) 
/*

 * driver/device initialization

 */

static int bcm4320a_early_init(struct usbnet *usbdev)

{

	/* bcm4320a doesn't handle configuration parameters well. Try

	 * set any and you get partially zeroed mac and broken device.

	 */



	return 0;

}



static int bcm4320b_early_init(struct usbnet *usbdev)

static void rndis_copy_module_params(struct usbnet *usbdev)

{

	struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);

	char buf[8];



	/* Early initialization settings, setting these won't have effect

	 * if called after generic_rndis_bind().

	 */



	priv->param_country[0] = modparam_country[0];

	priv->param_country[1] = modparam_country[1];
@@ -2652,6 +2638,27 @@ static int bcm4320b_early_init(struct usbnet *usbdev) 
		priv->param_workaround_interval = 500;

	else

		priv->param_workaround_interval = modparam_workaround_interval;

}



static int bcm4320a_early_init(struct usbnet *usbdev)

{

	/* bcm4320a doesn't handle configuration parameters well. Try

	 * set any and you get partially zeroed mac and broken device.

	 */



	return 0;

}



static int bcm4320b_early_init(struct usbnet *usbdev)

{

	struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);

	char buf[8];



	rndis_copy_module_params(usbdev);



	/* Early initialization settings, setting these won't have effect

	 * if called after generic_rndis_bind().

	 */



	rndis_set_config_parameter_str(usbdev, "Country", priv->param_country);

	rndis_set_config_parameter_str(usbdev, "FrameBursting",