netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@linux-foundation.org>
To: Andrew Morton <akpm@linux-foundation.org>,
	"David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-2.6] uml: hard_header fix
Date: Fri, 12 Oct 2007 11:06:45 -0700	[thread overview]
Message-ID: <20071012110645.4e7622af@freepuppy.rosehill> (raw)
In-Reply-To: <20071012001325.ba02a6f0.akpm@linux-foundation.org>

Fix hard_header for net-2.6 (2.6.23-mm1).

Please test this patch, unfortunately the tree it came from won't
build UML, so it isn't possible to give it a proper check.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

--- a/arch/um/drivers/slip_kern.c	2007-10-11 13:16:07.000000000 -0700
+++ b/arch/um/drivers/slip_kern.c	2007-10-12 11:06:00.000000000 -0700
@@ -30,9 +30,7 @@ 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_ops = NULL;
 	dev->hard_header_len = 0;
 	dev->addr_len = 0;
 	dev->type = ARPHRD_SLIP;
--- a/arch/um/drivers/slirp_kern.c	2007-10-11 13:16:07.000000000 -0700
+++ b/arch/um/drivers/slirp_kern.c	2007-10-12 11:05:52.000000000 -0700
@@ -31,9 +31,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->hard_header_ops = NULL;
 	dev->addr_len = 0;
 	dev->type = ARPHRD_SLIP;
 	dev->tx_queue_len = 256;

  reply	other threads:[~2007-10-12 18:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20071011213126.cf92efb7.akpm@linux-foundation.org>
     [not found] ` <20071012140328.f82af8e8.kamezawa.hiroyu@jp.fujitsu.com>
     [not found]   ` <20071011234202.2f15bb76.akpm@linux-foundation.org>
     [not found]     ` <20071012064658.GA8181@ftp.linux.org.uk>
2007-10-12  7:13       ` 2.6.23-mm1 Andrew Morton
2007-10-12 18:06         ` Stephen Hemminger [this message]
2007-10-12 19:04         ` 2.6.23-mm1 Al Viro
2007-10-12 19:47         ` 2.6.23-mm1 thread exit_group issue Mathieu Desnoyers
2007-10-12 20:01           ` Andrew Morton
2007-10-13  1:03           ` Andrew Morton
2007-10-13 11:48             ` Oleg Nesterov
2007-10-13 12:02               ` Oleg Nesterov
2007-10-13 17:49                 ` Andrew Morton
2007-10-14  4:04               ` Mathieu Desnoyers
2007-10-22 18:40 ` kernel panic when running tcpdump Mariusz Kozlowski
2007-10-22 19:03   ` Andrew Morton
2007-10-22 21:16     ` Mariusz Kozlowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071012110645.4e7622af@freepuppy.rosehill \
    --to=shemminger@linux-foundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).