From: Jeff Dike Date: Thu, 18 Oct 2007 02:35:04 +0000 (-0700) Subject: [UMP]: header_ops conversion needed for non-ethernet drivers X-Git-Tag: v2.6.24-rc1~294^2~37 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be8ad5a409ecdbc80d4087eb76746ba15c3a92e2;p=linux-2.6 [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 Signed-off-by: Andrew Morton Signed-off-by: David S. Miller --- diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c index ae67e7158e..6b4a0f9e38 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 240ee65086..d987af277d 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;