diff options
| author |   Jeff Dike <jdike@linux.intel.com> | 2007-10-17 19:35:04 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2007-10-17 19:35:04 -0700 |
| commit | be8ad5a409ecdbc80d4087eb76746ba15c3a92e2 (patch) | |
| tree | 765176617f89624ef2f9c459b44dcf5e26ff54ca /arch | |
| parent | [IRDA]: IrCOMM discovery indication simplification (diff) | |
| download | linux-dev-be8ad5a409ecdbc80d4087eb76746ba15c3a92e2.tar.xz linux-dev-be8ad5a409ecdbc80d4087eb76746ba15c3a92e2.zip | |
[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>
Diffstat (limited to '')
| -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 ae67e7158e71..6b4a0f9e38de 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) 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; diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c index 240ee650865d..d987af277db9 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) 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; |