diff options
author | Jeff Dike <jdike@linux.intel.com> | 2007-10-17 22:35:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-17 22:35:04 -0400 |
commit | be8ad5a409ecdbc80d4087eb76746ba15c3a92e2 (patch) | |
tree | 765176617f89624ef2f9c459b44dcf5e26ff54ca | |
parent | c310f099be953a20b5fabed341ad085f444cf2bd (diff) |
[UMP]: header_ops conversion needed for non-ethernet drivers
UML's two non-ethernet drivers need some header_ops conversion.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/um/drivers/slip_kern.c | 4 | ||||
-rw-r--r-- | arch/um/drivers/slirp_kern.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c index ae67e7158e7..6b4a0f9e38d 100644 --- a/arch/um/drivers/slip_kern.c +++ b/arch/um/drivers/slip_kern.c | |||
@@ -31,10 +31,8 @@ void slip_init(struct net_device *dev, void *data) | |||
31 | slip_proto_init(&spri->slip); | 31 | slip_proto_init(&spri->slip); |
32 | 32 | ||
33 | dev->init = NULL; | 33 | dev->init = NULL; |
34 | dev->header_cache_update = NULL; | ||
35 | dev->hard_header_cache = NULL; | ||
36 | dev->hard_header = NULL; | ||
37 | dev->hard_header_len = 0; | 34 | dev->hard_header_len = 0; |
35 | dev->header_ops = NULL; | ||
38 | dev->addr_len = 0; | 36 | dev->addr_len = 0; |
39 | dev->type = ARPHRD_SLIP; | 37 | dev->type = ARPHRD_SLIP; |
40 | dev->tx_queue_len = 256; | 38 | dev->tx_queue_len = 256; |
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c index 240ee650865..d987af277db 100644 --- a/arch/um/drivers/slirp_kern.c +++ b/arch/um/drivers/slirp_kern.c | |||
@@ -34,9 +34,7 @@ void slirp_init(struct net_device *dev, void *data) | |||
34 | 34 | ||
35 | dev->init = NULL; | 35 | dev->init = NULL; |
36 | dev->hard_header_len = 0; | 36 | dev->hard_header_len = 0; |
37 | dev->header_cache_update = NULL; | 37 | dev->header_ops = NULL; |
38 | dev->hard_header_cache = NULL; | ||
39 | dev->hard_header = NULL; | ||
40 | dev->addr_len = 0; | 38 | dev->addr_len = 0; |
41 | dev->type = ARPHRD_SLIP; | 39 | dev->type = ARPHRD_SLIP; |
42 | dev->tx_queue_len = 256; | 40 | dev->tx_queue_len = 256; |