From a7aa6aef9491a389530056fae9945c5f46935abc Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Fri, 22 May 2009 11:58:36 +0300 Subject: [PATCH] --- yaml --- r: 150443 b: refs/heads/master c: 59620e9fd631703ecdc7a6d304231b45560b8d26 h: refs/heads/master i: 150441: d9e0686b3bc5e497054a68485203958d5d2d1e9a 150439: 38628cd230154f90698a5b06a32b03d027f682e1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rndis_wlan.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fa22c57c071f..e9d24ddc5d51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62161aefa403a3f8d603b061f5688cf00928a2cc +refs/heads/master: 59620e9fd631703ecdc7a6d304231b45560b8d26 diff --git a/trunk/drivers/net/wireless/rndis_wlan.c b/trunk/drivers/net/wireless/rndis_wlan.c index 52fc647e6cb6..addd7a553acc 100644 --- a/trunk/drivers/net/wireless/rndis_wlan.c +++ b/trunk/drivers/net/wireless/rndis_wlan.c @@ -2275,7 +2275,17 @@ static void rndis_update_wireless_stats(struct work_struct *work) } -static int bcm4320_early_init(struct usbnet *usbdev) +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_wext_private *priv = get_rndis_wext_priv(usbdev); char buf[8]; @@ -2515,7 +2525,7 @@ static const struct driver_info bcm4320b_info = { .rx_fixup = rndis_rx_fixup, .tx_fixup = rndis_tx_fixup, .reset = rndis_wext_reset, - .early_init = bcm4320_early_init, + .early_init = bcm4320b_early_init, .link_change = rndis_wext_link_change, }; @@ -2528,7 +2538,7 @@ static const struct driver_info bcm4320a_info = { .rx_fixup = rndis_rx_fixup, .tx_fixup = rndis_tx_fixup, .reset = rndis_wext_reset, - .early_init = bcm4320_early_init, + .early_init = bcm4320a_early_init, .link_change = rndis_wext_link_change, }; @@ -2541,7 +2551,7 @@ static const struct driver_info rndis_wext_info = { .rx_fixup = rndis_rx_fixup, .tx_fixup = rndis_tx_fixup, .reset = rndis_wext_reset, - .early_init = bcm4320_early_init, + .early_init = bcm4320a_early_init, .link_change = rndis_wext_link_change, };