Merge with 2.4.0-test4-pre2.

10 files changed, 24 insertions, 14 deletions

diff --git a/drivers/net/wan/Config.in b/drivers/net/wan/Config.in
index 890fe7104..4621d3981 100644
--- a/drivers/net/wan/Config.in
+++ b/drivers/net/wan/Config.in
@@ -45,6 +45,8 @@ if [ "$CONFIG_WAN" = "y" ]; then
 
 	dep_tristate 'Sealevel Systems 4021 support' CONFIG_SEALEVEL_4021 m
 
+	dep_tristate 'SyncLink HDLC/SYNCPPP support' CONFIG_SYNCLINK_SYNCPPP m
+
 	tristate 'Frame relay DLCI support' CONFIG_DLCI
 	if [ "$CONFIG_DLCI" != "n" ]; then
 	   int 'Max open DLCI' CONFIG_DLCI_COUNT 24
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index 3904c76a6..d45f0ccfd 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -49,6 +49,14 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_SYNCLINK_SYNCPPP),y)
+CONFIG_SYNCPPP_BUILTIN = y
+else
+  ifeq ($(CONFIG_SYNCLINK_SYNCPPP),m)
+  CONFIG_SYNCPPP_MODULE = y
+  endif
+endif
+
 ifeq ($(CONFIG_COMX),y)
 LX_OBJS += comx.o
 else
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index b28fdafc1..09d6c9556 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -166,7 +166,7 @@ static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
 	return sppp_do_ioctl(d, ifr,cmd);
 }
 
-static struct enet_statistics *hostess_get_stats(struct net_device *d)
+static struct net_device_stats *hostess_get_stats(struct net_device *d)
 {
 	struct sv11_device *sv11=d->priv;
 	if(sv11)
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index c0b17f79f..30ec7ab8e 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -127,7 +127,7 @@ static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int lmc_rx (struct net_device *dev);
 static int lmc_open(struct net_device *dev);
 static int lmc_close(struct net_device *dev);
-static struct enet_statistics *lmc_get_stats(struct net_device *dev);
+static struct net_device_stats *lmc_get_stats(struct net_device *dev);
 static void lmc_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
 static int lmc_set_config(struct net_device *dev, struct ifmap *map);
 static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, size_t csr_size);
@@ -1961,7 +1961,7 @@ skip_out_of_mem:
     return 0;
 }
 
-static struct enet_statistics *lmc_get_stats (struct net_device *dev) /*fold00*/
+static struct net_device_stats *lmc_get_stats (struct net_device *dev) /*fold00*/
 {
     lmc_softc_t *sc;
     LMC_SPIN_FLAGS;
@@ -1978,7 +1978,7 @@ static struct enet_statistics *lmc_get_stats (struct net_device *dev) /*fold00*/
 
     lmc_trace(dev, "lmc_get_stats out");
 
-    return (struct enet_statistics *) &sc->stats;
+    return (struct net_device_stats *) &sc->stats;
 }
 
 #ifdef MODULE
diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h
index 67215b93b..9f50aada0 100644
--- a/drivers/net/wan/lmc/lmc_var.h
+++ b/drivers/net/wan/lmc/lmc_var.h
@@ -248,7 +248,7 @@ struct lmc___media {
 #define STATCHECK     0xBEEFCAFE
 
 /*  Included in this structure are first
- *   - standard enet_statistics
+ *   - standard net_device_stats
  *   - some other counters used for debug and driver performance
  *  evaluation -baz
  */
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 69a32c48d..37ef27487 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -100,7 +100,7 @@ static int  sbni_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static void sbni_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static int  sbni_close(struct net_device *dev);
 static void sbni_drop_tx_queue(struct net_device *dev);
-static struct enet_statistics *sbni_get_stats(struct net_device *dev);
+static struct net_device_stats *sbni_get_stats(struct net_device *dev);
 static void card_start(struct net_device *dev);
 static inline unsigned short sbni_recv(struct net_device *dev);
 void change_level(struct net_device *dev);
@@ -952,7 +952,7 @@ static void sbni_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	spin_unlock(&lp->lock);
 }
 
-static struct enet_statistics *sbni_get_stats(struct net_device *dev)
+static struct net_device_stats *sbni_get_stats(struct net_device *dev)
 {
 	struct net_local *lp = (struct net_local *)dev->priv;
 	return &lp->stats;
diff --git a/drivers/net/wan/sbni.h b/drivers/net/wan/sbni.h
index 56550d8f2..ce44bea46 100644
--- a/drivers/net/wan/sbni.h
+++ b/drivers/net/wan/sbni.h
@@ -106,7 +106,7 @@ struct sbni_in_stats {
  *    Board-specific info in dev->priv. 
  */
 struct net_local {
-	struct enet_statistics stats;
+	struct net_device_stats stats;
 
 	struct timer_list watchdog;
 	unsigned int realframelen;	/* the current size of the SB-frame */
diff --git a/drivers/net/wan/sdla_chdlc.c b/drivers/net/wan/sdla_chdlc.c
index 5989cdc47..efdf2069d 100644
--- a/drivers/net/wan/sdla_chdlc.c
+++ b/drivers/net/wan/sdla_chdlc.c
@@ -143,7 +143,7 @@ static int if_rebuild_hdr (void* hdr, struct net_device* dev, unsigned long radd
         struct sk_buff* skb);
 #endif
 static int if_send (struct sk_buff* skb, struct net_device* dev);
-static struct enet_statistics* if_stats (struct net_device* dev);
+static struct net_device_stats* if_stats (struct net_device* dev);
 
 /* CHDLC Firmware interface functions */
 static int chdlc_configure 	(sdla_t* card, void* data);
@@ -1169,7 +1169,7 @@ unsigned short calc_checksum (char *data, int len)
 
 /*============================================================================
  * Get ethernet-style interface statistics.
- * Return a pointer to struct enet_statistics.
+ * Return a pointer to struct net_device_stats.
  */
 #ifdef LINUX_2_1
 static struct net_device_stats* if_stats (struct net_device* dev)
@@ -1181,7 +1181,7 @@ static struct net_device_stats* if_stats (struct net_device* dev)
 	return &my_card->wandev.stats; 
 }
 #else
-static struct enet_statistics* if_stats (struct net_device* dev)
+static struct net_device_stats* if_stats (struct net_device* dev)
 {
         sdla_t *my_card;
         chdlc_private_area_t* chdlc_priv_area = dev->priv;
diff --git a/drivers/net/wan/sdla_fr.c b/drivers/net/wan/sdla_fr.c
index ab88a8bb3..69054c9f2 100644
--- a/drivers/net/wan/sdla_fr.c
+++ b/drivers/net/wan/sdla_fr.c
@@ -1588,9 +1588,9 @@ static void switch_net_numbers(unsigned char *sendpacket, unsigned long network_
 
 /*============================================================================
  * Get ethernet-style interface statistics.
- * Return a pointer to struct enet_statistics.
+ * Return a pointer to struct net_device_stats.
  */
-static struct enet_statistics* if_stats (struct net_device* dev)
+static struct net_device_stats* if_stats (struct net_device* dev)
 {
 	fr_channel_t* chan = dev->priv;
 	
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 68b318688..f1a895e36 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -164,7 +164,7 @@ static int sealevel_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
 	return sppp_do_ioctl(d, ifr,cmd);
 }
 
-static struct enet_statistics *sealevel_get_stats(struct net_device *d)
+static struct net_device_stats *sealevel_get_stats(struct net_device *d)
 {
 	struct slvl_device *slvl=d->priv;
 	if(slvl)