UML's two non-ethernet drivers need some header_ops conversion.
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
---
arch/um/drivers/slip_kern.c | 4 +---
arch/um/drivers/slirp_kern.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
Index: linux-2.6.22/arch/um/drivers/slip_kern.c
===================================================================
--- linux-2.6.22.orig/arch/um/drivers/slip_kern.c 2007-10-12
12:09:00.000000000 -0400
+++ linux-2.6.22/arch/um/drivers/slip_kern.c 2007-10-12 12:24:37.000000000
-0400
@@ -31,10 +31,8 @@ void slip_init(struct net_device *dev, v
slip_proto_init(&spri->slip);
dev->init = NULL;
- dev->header_cache_update = NULL;
- dev->hard_header_cache = NULL;
- dev->hard_header = NULL;
dev->hard_header_len = 0;
+ dev->header_ops = NULL;
dev->addr_len = 0;
dev->type = ARPHRD_SLIP;
dev->tx_queue_len = 256;
Index: linux-2.6.22/arch/um/drivers/slirp_kern.c
===================================================================
--- linux-2.6.22.orig/arch/um/drivers/slirp_kern.c 2007-10-12
12:09:00.000000000 -0400
+++ linux-2.6.22/arch/um/drivers/slirp_kern.c 2007-10-12 12:24:42.000000000
-0400
@@ -34,9 +34,7 @@ void slirp_init(struct net_device *dev,
dev->init = NULL;
dev->hard_header_len = 0;
- dev->header_cache_update = NULL;
- dev->hard_header_cache = NULL;
- dev->hard_header = NULL;
+ dev->header_ops = NULL;
dev->addr_len = 0;
dev->type = ARPHRD_SLIP;
dev->tx_queue_len = 256;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
