diff options
author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2008-01-25 17:51:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:26:58 -0500 |
commit | 7c39e038fc738012ba36ed222bb62545ee59c012 (patch) | |
tree | 89d295e93ffe70fbc6f498fde466eade8c173d8a /drivers/net/usb | |
parent | 476842b1962c7cf5ccea57dcfad26dc77d16e363 (diff) |
rndis_host: Add early_init function pointer to 'struct rndis_data'.
Function pointer is for 'subminidrivers' that need to do work on device
right after minidriver has initialized hardware.
For example, rndis_wlan setting device specific configuration parameters
with OID_GEN_RNDIS_CONFIG_PARAMETER right after rndis_host has
initialized hardware with RNDIS_INIT.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/rndis_host.c | 6 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 1d6bf0a28cec..08139030954f 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
@@ -336,6 +336,12 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf) | |||
336 | dev->hard_mtu, tmp, dev->rx_urb_size, | 336 | dev->hard_mtu, tmp, dev->rx_urb_size, |
337 | 1 << le32_to_cpu(u.init_c->packet_alignment)); | 337 | 1 << le32_to_cpu(u.init_c->packet_alignment)); |
338 | 338 | ||
339 | /* module has some device initialization code needs to be done right | ||
340 | * after RNDIS_INIT */ | ||
341 | if (dev->driver_info->early_init && | ||
342 | dev->driver_info->early_init(dev) != 0) | ||
343 | goto halt_fail_and_release; | ||
344 | |||
339 | /* Get designated host ethernet address */ | 345 | /* Get designated host ethernet address */ |
340 | reply_len = ETH_ALEN; | 346 | reply_len = ETH_ALEN; |
341 | retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS, | 347 | retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS, |
diff --git a/drivers/net/usb/usbnet.h b/drivers/net/usb/usbnet.h index 0b4bf09fc8b1..25b63d3339dc 100644 --- a/drivers/net/usb/usbnet.h +++ b/drivers/net/usb/usbnet.h | |||
@@ -116,6 +116,11 @@ struct driver_info { | |||
116 | struct sk_buff *(*tx_fixup)(struct usbnet *dev, | 116 | struct sk_buff *(*tx_fixup)(struct usbnet *dev, |
117 | struct sk_buff *skb, gfp_t flags); | 117 | struct sk_buff *skb, gfp_t flags); |
118 | 118 | ||
119 | /* early initialization code, can sleep. This is for minidrivers | ||
120 | * having 'subminidrivers' that need to do extra initialization | ||
121 | * right after minidriver have initialized hardware. */ | ||
122 | int (*early_init)(struct usbnet *dev); | ||
123 | |||
119 | /* for new devices, use the descriptor-reading code instead */ | 124 | /* for new devices, use the descriptor-reading code instead */ |
120 | int in; /* rx endpoint */ | 125 | int in; /* rx endpoint */ |
121 | int out; /* tx endpoint */ | 126 | int out; /* tx endpoint */ |