Add sysfs support to the uml network driver. Also comment
the eth_init function, I think that one is never ever needed
as the devices are initialized when the underlying transport
mechanism registeres.
Signed-off-by: Gerd Knorr <[EMAIL PROTECTED]>
---
arch/um/drivers/net_kern.c | 24 ++++++++++++++++++++++--
arch/um/include/net_kern.h | 1 +
2 files changed, 23 insertions(+), 2 deletions(-)
Index: linux-2.6.10-rc3/arch/um/include/net_kern.h
===================================================================
--- linux-2.6.10-rc3.orig/arch/um/include/net_kern.h 2004-12-07
12:12:18.000000000 +0100
+++ linux-2.6.10-rc3/arch/um/include/net_kern.h 2004-12-07 13:11:07.059493999
+0100
@@ -14,6 +14,7 @@
struct uml_net {
struct list_head list;
struct net_device *dev;
+ struct platform_device pdev;
int index;
unsigned char mac[ETH_ALEN];
int have_mac;
Index: linux-2.6.10-rc3/arch/um/drivers/net_kern.c
===================================================================
--- linux-2.6.10-rc3.orig/arch/um/drivers/net_kern.c 2004-12-07
12:11:53.000000000 +0100
+++ linux-2.6.10-rc3/arch/um/drivers/net_kern.c 2004-12-07 14:23:20.664164072
+0100
@@ -30,6 +30,8 @@
#include "irq_user.h"
#include "irq_kern.h"
+#define DRIVER_NAME "uml-netdev"
+
static spinlock_t opened_lock = SPIN_LOCK_UNLOCKED;
LIST_HEAD(opened);
@@ -252,7 +254,7 @@ static int uml_net_ioctl(struct net_devi
{
static const struct ethtool_drvinfo info = {
.cmd = ETHTOOL_GDRVINFO,
- .driver = "uml virtual ethernet",
+ .driver = DRIVER_NAME,
.version = "42",
};
void *useraddr;
@@ -289,6 +291,12 @@ void uml_net_user_timer_expire(unsigned
static spinlock_t devices_lock = SPIN_LOCK_UNLOCKED;
static struct list_head devices = LIST_HEAD_INIT(devices);
+static struct device_driver uml_net_driver = {
+ .name = DRIVER_NAME,
+ .bus = &platform_bus_type,
+};
+static int driver_registered;
+
static int eth_configure(int n, void *init, char *mac,
struct transport *transport)
{
@@ -330,6 +338,16 @@ static int eth_configure(int n, void *in
return 1;
}
+ /* sysfs register */
+ if (!driver_registered) {
+ driver_register(¨_net_driver);
+ driver_registered = 1;
+ }
+ device->pdev.id = n;
+ device->pdev.name = DRIVER_NAME;
+ platform_device_register(&device->pdev);
+ SET_NETDEV_DEV(dev,&device->pdev.dev);
+
/* If this name ends up conflicting with an existing registered
* netdevice, that is OK, register_netdev{,ice}() will notice this
* and fail.
@@ -560,6 +578,7 @@ __uml_help(eth_setup,
" Configure a network device.\n\n"
);
+#if 0
static int eth_init(void)
{
struct list_head *ele, *next;
@@ -574,8 +593,8 @@ static int eth_init(void)
return(1);
}
-
__initcall(eth_init);
+#endif
static int net_config(char *str)
{
@@ -616,6 +635,7 @@ static int net_remove(char *str)
if(lp->fd > 0) return(-1);
if(lp->remove != NULL) (*lp->remove)(&lp->user);
unregister_netdev(dev);
+ platform_device_unregister(&device->pdev);
list_del(&device->list);
kfree(device);
--
#define printk(args...) fprintf(stderr, ## args)
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
User-mode-linux-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
