WAN: farsync driver no longer uses syncppp.c directly

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index d61fef36afc96b88e722e321dbd6aab016ef1e9f..94c1d474e306b2f20ba4927653a545b63ed9c879 100644 (file)
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -24,7 +24,7 @@ pc300-objs                    := $(pc300-y)
 obj-$(CONFIG_HOSTESS_SV11)     += z85230.o     syncppp.o       hostess_sv11.o
 obj-$(CONFIG_SEALEVEL_4021)    += z85230.o     syncppp.o       sealevel.o
 obj-$(CONFIG_COSA)             +=              syncppp.o       cosa.o
-obj-$(CONFIG_FARSYNC)          +=              syncppp.o       farsync.o
+obj-$(CONFIG_FARSYNC)          += farsync.o
 obj-$(CONFIG_DSCC4)             +=                             dscc4.o
 obj-$(CONFIG_LANMEDIA)         +=              syncppp.o
 obj-$(CONFIG_X25_ASY)          += x25_asy.o

diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 754f00809e3e5f31429c9b36a94fd2dc1a503f52..9557ad078ab802e711496516d950f2d04cff3727 100644 (file)
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -47,10 +47,7 @@ MODULE_LICENSE("GPL");
 /*      Default parameters for the link
  */
 #define FST_TX_QUEUE_LEN        100    /* At 8Mbps a longer queue length is
-                                        * useful, the syncppp module forces
-                                        * this down assuming a slower line I
-                                        * guess.
-                                        */
+                                        * useful */
 #define FST_TXQ_DEPTH           16     /* This one is for the buffering
                                         * of frames on the way down to the card
                                         * so that we can keep the card busy

diff --git a/drivers/net/wan/farsync.h b/drivers/net/wan/farsync.h
index d871dafa87a14695ff973c86467b0d759114df8c..6b27e7c3d449f17c039cd0a0703262442d08a04f 100644 (file)
--- a/drivers/net/wan/farsync.h
+++ b/drivers/net/wan/farsync.h
@@ -54,9 +54,6 @@
 
 
 /*      Ioctl call command values
- *
- *      The first three private ioctls are used by the sync-PPP module,
- *      allowing a little room for expansion we start our numbering at 10.
  */
 #define FSTWRITE        (SIOCDEVPRIVATE+10)
 #define FSTCPURESET     (SIOCDEVPRIVATE+11)
@@ -202,9 +199,6 @@ struct fstioc_info {
 #define J1              7
 
 /* "proto" */
-#define FST_HDLC        1               /* Cisco compatible HDLC */
-#define FST_PPP         2               /* Sync PPP */
-#define FST_MONITOR     3               /* Monitor only (raw packet reception) */
 #define FST_RAW         4               /* Two way raw packets */
 #define FST_GEN_HDLC    5               /* Using "Generic HDLC" module */