From b0971fb107846e0007fb3a1a8dbc73d0e67f5148 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Wed, 17 Oct 2007 19:35:04 -0700 Subject: [PATCH] --- yaml --- r: 71258 b: refs/heads/master c: be8ad5a409ecdbc80d4087eb76746ba15c3a92e2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/slip_kern.c | 4 +--- trunk/arch/um/drivers/slirp_kern.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 00edba4e6c33..2b4a67069304 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c310f099be953a20b5fabed341ad085f444cf2bd +refs/heads/master: be8ad5a409ecdbc80d4087eb76746ba15c3a92e2 diff --git a/trunk/arch/um/drivers/slip_kern.c b/trunk/arch/um/drivers/slip_kern.c index ae67e7158e71..6b4a0f9e38de 100644 --- a/trunk/arch/um/drivers/slip_kern.c +++ b/trunk/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/trunk/arch/um/drivers/slirp_kern.c b/trunk/arch/um/drivers/slirp_kern.c index 240ee650865d..d987af277db9 100644 --- a/trunk/arch/um/drivers/slirp_kern.c +++ b/trunk/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;