From: Andrew Morton <akpm@digeo.com>
To: Alexander Hoogerhuis <alexh@ihatent.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: Re: 2.5.69-mm4
Date: Tue, 13 May 2003 00:11:35 -0700 [thread overview]
Message-ID: <20030513001135.2395860a.akpm@digeo.com> (raw)
In-Reply-To: <87vfwf8h2n.fsf@lapper.ihatent.com>
Alexander Hoogerhuis <alexh@ihatent.com> wrote:
>
> net/core/dev.c:1496: conflicting types for `handle_bridge'
> net/core/dev.c:1468: previous declaration of `handle_bridge'
argh, sorry, stupid.
diff -puN net/core/dev.c~handle_bridge-fix net/core/dev.c
--- 25/net/core/dev.c~handle_bridge-fix 2003-05-13 00:10:47.000000000 -0700
+++ 25-akpm/net/core/dev.c 2003-05-13 00:10:57.000000000 -0700
@@ -1491,7 +1491,7 @@ static inline void handle_diverter(struc
#endif
}
-static inline int handle_bridge(struct sk_buff *skb,
+static inline int __handle_bridge(struct sk_buff *skb,
struct packet_type **pt_prev, int *ret)
{
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
@@ -1548,7 +1548,7 @@ int netif_receive_skb(struct sk_buff *sk
handle_diverter(skb);
- if (handle_bridge(skb, &pt_prev, &ret))
+ if (__handle_bridge(skb, &pt_prev, &ret))
goto out;
list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type)&15], list) {
_
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"aart@kvack.org"> aart@kvack.org </a>
next prev parent reply other threads:[~2003-05-13 7:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-13 5:55 2.5.69-mm4 Andrew Morton
2003-05-13 7:02 ` 2.5.69-mm4 Alexander Hoogerhuis
2003-05-13 7:11 ` Andrew Morton [this message]
2003-05-13 8:00 ` 2.5.69-mm4 Alexander Hoogerhuis
2003-05-13 8:55 ` 2.5.69-mm4 Helge Hafting
2003-05-13 9:04 ` 2.5.69-mm4 Andrew Morton
2003-05-13 14:05 ` [PATCH] Re: 2.5.69-mm4 undefined active_load_balance Helge Hafting
2003-05-13 16:27 ` Helge Hafting
2003-05-13 16:40 ` Helge Hafting
2003-05-13 19:38 ` William Lee Irwin III
2003-05-13 21:31 ` Helge Hafting
2003-05-13 21:35 ` William Lee Irwin III
2003-05-13 11:04 ` 2.5.69-mm4 Alexander Hoogerhuis
2003-05-13 12:43 ` 2.5.69-mm4 Ed Tomlinson
2003-05-13 20:10 ` 2.5.69-mm4 Andrew Morton
2003-05-13 17:08 ` 2.5.69-mm4 smp crash, seems fs/vm related Helge Hafting
2003-05-13 20:17 ` 2.5.69-mm4 William Lee Irwin III
2003-05-13 20:25 ` 2.5.69-mm4 William Lee Irwin III
2003-05-14 0:15 ` 2.5.69-mm4 William Lee Irwin III
2003-05-14 0:46 ` 2.5.69-mm4 David Mosberger
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=20030513001135.2395860a.akpm@digeo.com \
--to=akpm@digeo.com \
--cc=alexh@ihatent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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