Frank Davis wrote:
> Hello all,
> The following patch fixes the below 'make bzImage' error. Please review
> for inclusion.
> --- net/802/tr.c.old Thu Jun 20 20:52:05 2002
> +++ net/802/tr.c Thu Jun 20 20:51:59 2002
make the patch one level higher, so it applies with '-p1', not '-p0'.
> -static void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
> +void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
This declaration is not needed any more, since it now is in the header file. The other
declaration in net/netsyms.c and net/llc/llc_mac.c should be removed as well.
replacement patch follows.
Arnd <><
diff -u -r1.1.1.1 trdevice.h
--- a/include/linux/trdevice.h 2002/03/13 19:33:11 1.1.1.1
+++ b/include/linux/trdevice.h 2002/07/10 15:34:28
@@ -33,6 +33,9 @@
void *saddr, unsigned len);
extern int tr_rebuild_header(struct sk_buff *skb);
extern unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev);
+extern void tr_source_route(struct sk_buff *skb,
+ struct trh_hdr *trh,
+ struct net_device *dev);
extern struct net_device *init_trdev(struct net_device *dev, int sizeof_priv);
extern struct net_device *alloc_trdev(int sizeof_priv);
extern int register_trdev(struct net_device *dev);
diff -u -r1.6 netsyms.c
--- a/net/netsyms.c 2002/06/25 09:36:58 1.6
+++ b/net/netsyms.c 2002/07/10 15:34:28
@@ -444,8 +444,6 @@
#endif /* CONFIG_INET */
#if defined(CONFIG_TR) && defined(CONFIG_LLC)
-extern void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh,
- struct net_device *dev);
EXPORT_SYMBOL(tr_source_route);
EXPORT_SYMBOL(tr_type_trans);
#endif
diff -u -r1.3 tr.c
--- a/net/802/tr.c 2002/05/27 12:33:18 1.3
+++ b/net/802/tr.c 2002/07/10 15:34:28
@@ -36,7 +36,6 @@
#include <linux/init.h>
#include <net/arp.h>
-static void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev);
static void rif_check_expire(unsigned long dummy);
@@ -230,7 +229,7 @@
* We try to do source routing...
*/
-static void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *dev)
+void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *dev)
{
int i, slack;
unsigned int hash;
diff -u -r1.1 llc_mac.c
--- a/net/llc/llc_mac.c 2002/06/25 09:37:00 1.1
+++ b/net/llc/llc_mac.c 2002/07/10 15:34:29
@@ -25,10 +25,7 @@
#include <net/llc_evnt.h>
#include <net/llc_c_ev.h>
#include <net/llc_s_ev.h>
-#ifdef CONFIG_TR
-extern void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh,
- struct net_device *dev);
-#endif
+
/* function prototypes */
static void fix_up_incoming_skb(struct sk_buff *skb);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jul 15 2002 - 22:00:17 EST