Re: [net-next 0/9][pull request] Complete drivers/net/ move

On Wed, 2011-08-24 at 00:25 -0700, David Miller wrote:

From: Jeff Kirsher <redacted>
Date: Tue, 23 Aug 2011 21:39:25 -0700

quoted

The following series moves the FDDI, PPP, HIPPI, PLIP, SLIP and the cleanup
of the drivers/net/ Kconfig & Makefile's.  This series in addition moves
the 2 remaining drivers in drivers/net/pcmcia/ into their respective
directories (arcnet & tokenring).  The last remaining change is to
make the all the "new" Kconfig options introduced by the Ethernet
drivers move to yes, so that current defconfig's will compile the expected
drivers.

v2- remove the changes for FDDI, HIPPI, PPP, etc Kconfig from menuconfig back
to config and used tristate instead of bool.  Apparently some configs load
FDDI and others as a module.

Still has build failures:

In file included from drivers/net/fddi/skfp/hwmtm.c:29:0:
drivers/net/fddi/skfp/h/smc.h:41:24: fatal error: h/osdef1st.h: No such file or directory
compilation terminated.
make[4]: *** [drivers/net/fddi/skfp/hwmtm.o] Error 1
make[4]: *** Waiting for unfinished jobs....
In file included from drivers/net/fddi/skfp/skfddi.c:97:0:
drivers/net/fddi/skfp/h/smc.h:41:24: fatal error: h/osdef1st.h: No such file or directory
compilation terminated.
make[4]: *** [drivers/net/fddi/skfp/skfddi.o] Error 1
make[3]: *** [drivers/net/fddi/skfp] Error 2
make[2]: *** [drivers/net/fddi] Error 2
make[2]: *** Waiting for unfinished jobs....
drivers/net/tokenring/ibmtr_cs.c: In function ‘ibmtr_config’:
drivers/net/tokenring/ibmtr_cs.c:195:5: warning: ‘pcmcia_request_exclusive_irq’ is deprecated (declared at include/pcmcia/ds.h:201) [-Wdeprecated-declarations]
make[1]: *** [drivers/net] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [drivers] Error 2

I am flabbergasted that this built just fine before the move.  I am
wondering why the move exposed the problem in the driver.  I get the
driver working, but had to make the following changes (NOTE- I will
submit a for these changes):

diff --git a/drivers/net/fddi/skfp/h/cmtdef.h

b/drivers/net/fddi/skfp/h/cmtdef.h
index 5a6c612..f5bc90f 100644

--- a/drivers/net/fddi/skfp/h/cmtdef.h
+++ b/drivers/net/fddi/skfp/h/cmtdef.h

@@ -477,8 +477,8 @@ struct s_plc {
 /*
  * function prototypes
  */
-#include "h/mbuf.h"	/* Type definitions for MBUFs */
-#include "h/smtstate.h"	/* struct smt_state */
+#include "mbuf.h"	/* Type definitions for MBUFs */
+#include "smtstate.h"	/* struct smt_state */
 
 void hwt_restart(struct s_smc *smc);	/* hwt.c */
 SMbuf *smt_build_frame(struct s_smc *smc, int class, int type,

diff --git a/drivers/net/fddi/skfp/h/hwmtm.h

b/drivers/net/fddi/skfp/h/hwmtm.h
index e1a7e5f..5924d42 100644

--- a/drivers/net/fddi/skfp/h/hwmtm.h
+++ b/drivers/net/fddi/skfp/h/hwmtm.h

@@ -15,7 +15,7 @@
 #ifndef	_HWM_
 #define	_HWM_
 
-#include "h/mbuf.h"
+#include "mbuf.h"
 
 /*
  * MACRO for DMA synchronization:

diff --git a/drivers/net/fddi/skfp/h/sba.h

b/drivers/net/fddi/skfp/h/sba.h
index 638cf02..35ddb44 100644

--- a/drivers/net/fddi/skfp/h/sba.h
+++ b/drivers/net/fddi/skfp/h/sba.h

@@ -19,8 +19,8 @@
 #ifndef _SBA_
 #define _SBA_
 
-#include "h/mbuf.h"
-#include "h/sba_def.h"
+#include "mbuf.h"
+#include "sba_def.h"
 
 #ifdef	SBA
 

diff --git a/drivers/net/fddi/skfp/h/skfbiinc.h

b/drivers/net/fddi/skfp/h/skfbiinc.h
index ac2d719..ce72557 100644

--- a/drivers/net/fddi/skfp/h/skfbiinc.h
+++ b/drivers/net/fddi/skfp/h/skfbiinc.h

@@ -15,7 +15,7 @@
 #ifndef	_SKFBIINC_
 #define _SKFBIINC_
 
-#include "h/supern_2.h"
+#include "supern_2.h"
 
 /*
  * special defines for use into .asm files

diff --git a/drivers/net/fddi/skfp/h/smc.h

b/drivers/net/fddi/skfp/h/smc.h
index c774a95..3ca308b 100644

--- a/drivers/net/fddi/skfp/h/smc.h
+++ b/drivers/net/fddi/skfp/h/smc.h

@@ -38,18 +38,18 @@
  *	fddi.h
  */
 #ifdef	OSDEF
-#include "h/osdef1st.h"
+#include "osdef1st.h"
 #endif	/* OSDEF */
 #ifdef	OEM_CONCEPT
 #include "oemdef.h"
 #endif	/* OEM_CONCEPT */
-#include "h/smt.h"
-#include "h/cmtdef.h"
-#include "h/fddimib.h"
-#include "h/targethw.h"		/* all target hw dependencies */
-#include "h/targetos.h"		/* all target os dependencies */
+#include "smt.h"
+#include "cmtdef.h"
+#include "fddimib.h"
+#include "targethw.h"		/* all target hw dependencies */
+#include "targetos.h"		/* all target os dependencies */
 #ifdef	ESS
-#include "h/sba.h"
+#include "sba.h"
 #endif
 
 /*

diff --git a/drivers/net/fddi/skfp/h/targethw.h

b/drivers/net/fddi/skfp/h/targethw.h
index 626dc72..842a690 100644

--- a/drivers/net/fddi/skfp/h/targethw.h
+++ b/drivers/net/fddi/skfp/h/targethw.h

@@ -25,11 +25,11 @@
 #define SK_ML_ID_2	0x30
 #endif
 
-#include	"h/skfbi.h"
+#include	"skfbi.h"
 #ifndef TAG_MODE	
-#include	"h/fplus.h"
+#include	"fplus.h"
 #else
-#include	"h/fplustm.h"
+#include	"fplustm.h"
 #endif
 
 #ifndef	HW_PTR

diff --git a/drivers/net/fddi/skfp/h/targetos.h

b/drivers/net/fddi/skfp/h/targetos.h
index 5d940e7..53bacc1 100644

--- a/drivers/net/fddi/skfp/h/targetos.h
+++ b/drivers/net/fddi/skfp/h/targetos.h

@@ -58,7 +58,7 @@
 #define	ADDR(a) (((a)>>7) ? (outp(smc->hw.iop+B0_RAP,(a)>>7),

(smc->hw.iop+( ((a)&0x7F) | ((a)>>7 ? 0x80:0)) )) : (smc->hw.iop
+(((a)&0x7F)|((a)>>7 ? 0x80:0))))
 #endif
 
-#include "h/hwmtm.h"
+#include "hwmtm.h"
 
 #define TRUE  1
 #define FALSE 0