Skip to content

Commit

Permalink
rndis_wlan: move copy of module parameters to separate function
Browse files Browse the repository at this point in the history
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Jussi Kivilinna authored and John W. Linville committed Dec 21, 2009
1 parent da2fb4e commit cef6e91
Showing 1 changed file with 22 additions and 15 deletions.
37 changes: 22 additions & 15 deletions drivers/net/wireless/rndis_wlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit cef6e91

Please sign in to comment.