[2.6 patch] net/atm/lec.c: remove inlines (fwd)

[Adrian Bunk]

FYI:
The patch forwarded below is still required in 2.6.8-rc2-mm1.


----- Forwarded message from Adrian Bunk <bunk@xxxxxxxxx> -----

Date:	Thu, 15 Jul 2004 21:17:10 +0200
From: Adrian Bunk <bunk@xxxxxxxxx>
To: carnil@xxxxxxxxx
Cc: chas@xxxxxxxxxxxxxxxx, linux-atm-general@xxxxxxxxxxxxxxxxxxxxx,
	linux-kernel@xxxxxxxxxxxxxxx
Subject: [2.6 patch] net/atm/lec.c: remove inlines

Trying to compile net/atm/lec.c in 2.6.8-rc1-mm1 using gcc 3.4 results 
in the following compile error:

<--  snip  -->

...
  CC      net/atm/lec.o
net/atm/lec.c: In function `lec_atm_send':
net/atm/lec.c:75: sorry, unimplemented: inlining failed in call to 
'lec_arp_find': function body not available
net/atm/lec.c:459: sorry, unimplemented: called from here
net/atm/lec.c:77: sorry, unimplemented: inlining failed in call to 
'lec_arp_remove': function body not available
net/atm/lec.c:460: sorry, unimplemented: called from here
make[2]: *** [net/atm/lec.o] Error 1

<--  snip  -->


The patch below removes the inlines from the functions in question.

An alternative approach would be to move the inline functions above the 
first place where they are used.


diffstat output:
 net/atm/lec.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.7-mm6-full-gcc3.4/net/atm/lec.c.old	2004-07-09 02:12:36.000000000 +0200
+++ linux-2.6.7-mm6-full-gcc3.4/net/atm/lec.c	2004-07-09 02:15:16.000000000 +0200
@@ -71,9 +71,9 @@
 static int lec_close(struct net_device *dev);
 static struct net_device_stats *lec_get_stats(struct net_device *dev);
 static void lec_init(struct net_device *dev);
-static inline struct lec_arp_table* lec_arp_find(struct lec_priv *priv,
+static struct lec_arp_table* lec_arp_find(struct lec_priv *priv,
                                                      unsigned char *mac_addr);
-static inline int lec_arp_remove(struct lec_priv *priv,
+static int lec_arp_remove(struct lec_priv *priv,
 				     struct lec_arp_table *to_remove);
 /* LANE2 functions */
 static void lane2_associate_ind (struct net_device *dev, u8 *mac_address,
@@ -1468,7 +1468,7 @@
 /*
  * Remove entry from lec_arp_table
  */
-static inline int 
+static int 
 lec_arp_remove(struct lec_priv *priv,
                struct lec_arp_table *to_remove)
 {
@@ -1755,7 +1755,7 @@
 /* 
  * Find entry by mac_address
  */
-static inline struct lec_arp_table*
+static struct lec_arp_table*
 lec_arp_find(struct lec_priv *priv,
              unsigned char *mac_addr)
 {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

----- End forwarded message -----


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/