[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Fri, 04 Apr 2008 18:14:36 +0400
From: Pavel Emelyanov <xemul@...nvz.org>
To: Linux Netdev List <netdev@...r.kernel.org>
Subject: [RFC][PATCH 3/3] Move net_device->uninit callback on net_device_ops.
The void calls are even simpler.
Plus ~18 more patches and all the ops will be moved on the
net_device_ops and it will be possible to start converting
device drivers...
So, what is your opinion about all this?
Signed-off-by: Pavel Emelyanov <xemul@...nvz.org>
---
net/core/dev.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index a01c078..3428534 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3644,8 +3644,8 @@ static void rollback_registered(struct net_device *dev)
*/
dev_addr_discard(dev);
- if (dev->uninit)
- dev->uninit(dev);
+ if (dev->nd_ops->uninit)
+ dev->nd_ops->uninit(dev);
/* Notifier chain MUST detach us from master device. */
BUG_TRAP(!dev->master);
@@ -3804,8 +3804,8 @@ out:
return ret;
err_uninit:
- if (dev->uninit)
- dev->uninit(dev);
+ if (dev->nd_ops->uninit)
+ dev->nd_ops->uninit(dev);
goto out;
}
@@ -3988,8 +3988,15 @@ static int nd_default_init(struct net_device *dev)
return 0;
}
+static void nd_default_uninit(struct net_device *dev)
+{
+ if (dev->uninit)
+ dev->uninit(dev);
+}
+
static struct net_device_ops nd_default_ops = {
.init = nd_default_init,
+ .uninit = nd_default_uninit,
};
/**
--
1.5.3.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists