lkml.org 
[lkml]   [2003]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [Patch] Compile fix for 2.6.0-test5-mm4 in net/atm/proc.c
Date
From
In message <3F6F52AE.3080206@wanadoo.fr>,Remi Colinet writes:
>
> state->family = family;
>+#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
> state->clip_info = try_atm_clip_ops();
>+#endif
>

instead of doing this, it would probably be cleaner to put the
ifdef inside the clip header file and just return 0 when !CLIP.

dave, can you apply this to 2.6?

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1446 -> 1.1447
# net/atm/proc.c 1.29 -> 1.30
# include/net/atmclip.h 1.2 -> 1.3
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/23 chas@relax.cmf.nrl.navy.mil 1.1447
# [ATM]: if !CLIP try_atm_clip_ops() should always fail
# --------------------------------------------
#
diff -Nru a/include/net/atmclip.h b/include/net/atmclip.h
--- a/include/net/atmclip.h Tue Sep 23 08:48:18 2003
+++ b/include/net/atmclip.h Tue Sep 23 08:48:18 2003
@@ -67,7 +67,15 @@
};

void atm_clip_ops_set(struct atm_clip_ops *);
+#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
int try_atm_clip_ops(void);
+#else
+static inline int try_atm_clip_ops(void)
+{
+ return 0;
+}
+#endif
+

extern struct neigh_table *clip_tbl_hook;
extern struct atm_clip_ops *atm_clip_ops;
diff -Nru a/net/atm/proc.c b/net/atm/proc.c
--- a/net/atm/proc.c Tue Sep 23 08:48:18 2003
+++ b/net/atm/proc.c Tue Sep 23 08:48:18 2003
@@ -32,10 +32,8 @@
#include "common.h" /* atm_proc_init prototype */
#include "signaling.h" /* to get sigd - ugly too */

-#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
#include <net/atmclip.h>
#include "ipcommon.h"
-#endif

#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
#include "lec.h"
-
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/
\
 
 \ /
  Last update: 2005-03-22 13:48    [W:0.513 / U:0.872 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site