diff options
author | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-01 16:04:01 -0400 |
---|---|---|
committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-23 17:00:38 -0400 |
commit | 0bee8db8f63b099412fdbce5b55b01d9f177951d (patch) | |
tree | fd2d64cbe27ba7765bff6100231d7a81298b5c26 | |
parent | b22267d3883ebc76093e9f36c4c738125e092402 (diff) |
WAN: farsync driver no longer uses syncppp.c directly
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
-rw-r--r-- | drivers/net/wan/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wan/farsync.c | 5 | ||||
-rw-r--r-- | drivers/net/wan/farsync.h | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index d61fef36afc9..94c1d474e306 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile | |||
@@ -24,7 +24,7 @@ pc300-objs := $(pc300-y) | |||
24 | obj-$(CONFIG_HOSTESS_SV11) += z85230.o syncppp.o hostess_sv11.o | 24 | obj-$(CONFIG_HOSTESS_SV11) += z85230.o syncppp.o hostess_sv11.o |
25 | obj-$(CONFIG_SEALEVEL_4021) += z85230.o syncppp.o sealevel.o | 25 | obj-$(CONFIG_SEALEVEL_4021) += z85230.o syncppp.o sealevel.o |
26 | obj-$(CONFIG_COSA) += syncppp.o cosa.o | 26 | obj-$(CONFIG_COSA) += syncppp.o cosa.o |
27 | obj-$(CONFIG_FARSYNC) += syncppp.o farsync.o | 27 | obj-$(CONFIG_FARSYNC) += farsync.o |
28 | obj-$(CONFIG_DSCC4) += dscc4.o | 28 | obj-$(CONFIG_DSCC4) += dscc4.o |
29 | obj-$(CONFIG_LANMEDIA) += syncppp.o | 29 | obj-$(CONFIG_LANMEDIA) += syncppp.o |
30 | obj-$(CONFIG_X25_ASY) += x25_asy.o | 30 | obj-$(CONFIG_X25_ASY) += x25_asy.o |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 754f00809e3e..9557ad078ab8 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
@@ -47,10 +47,7 @@ MODULE_LICENSE("GPL"); | |||
47 | /* Default parameters for the link | 47 | /* Default parameters for the link |
48 | */ | 48 | */ |
49 | #define FST_TX_QUEUE_LEN 100 /* At 8Mbps a longer queue length is | 49 | #define FST_TX_QUEUE_LEN 100 /* At 8Mbps a longer queue length is |
50 | * useful, the syncppp module forces | 50 | * useful */ |
51 | * this down assuming a slower line I | ||
52 | * guess. | ||
53 | */ | ||
54 | #define FST_TXQ_DEPTH 16 /* This one is for the buffering | 51 | #define FST_TXQ_DEPTH 16 /* This one is for the buffering |
55 | * of frames on the way down to the card | 52 | * of frames on the way down to the card |
56 | * so that we can keep the card busy | 53 | * so that we can keep the card busy |
diff --git a/drivers/net/wan/farsync.h b/drivers/net/wan/farsync.h index d871dafa87a1..6b27e7c3d449 100644 --- a/drivers/net/wan/farsync.h +++ b/drivers/net/wan/farsync.h | |||
@@ -54,9 +54,6 @@ | |||
54 | 54 | ||
55 | 55 | ||
56 | /* Ioctl call command values | 56 | /* Ioctl call command values |
57 | * | ||
58 | * The first three private ioctls are used by the sync-PPP module, | ||
59 | * allowing a little room for expansion we start our numbering at 10. | ||
60 | */ | 57 | */ |
61 | #define FSTWRITE (SIOCDEVPRIVATE+10) | 58 | #define FSTWRITE (SIOCDEVPRIVATE+10) |
62 | #define FSTCPURESET (SIOCDEVPRIVATE+11) | 59 | #define FSTCPURESET (SIOCDEVPRIVATE+11) |
@@ -202,9 +199,6 @@ struct fstioc_info { | |||
202 | #define J1 7 | 199 | #define J1 7 |
203 | 200 | ||
204 | /* "proto" */ | 201 | /* "proto" */ |
205 | #define FST_HDLC 1 /* Cisco compatible HDLC */ | ||
206 | #define FST_PPP 2 /* Sync PPP */ | ||
207 | #define FST_MONITOR 3 /* Monitor only (raw packet reception) */ | ||
208 | #define FST_RAW 4 /* Two way raw packets */ | 202 | #define FST_RAW 4 /* Two way raw packets */ |
209 | #define FST_GEN_HDLC 5 /* Using "Generic HDLC" module */ | 203 | #define FST_GEN_HDLC 5 /* Using "Generic HDLC" module */ |
210 | 204 | ||