patch-2.1.15 linux/drivers/net/ppp.c

Next file: linux/drivers/net/shaper.c
Previous file: linux/drivers/net/plip.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.14/linux/drivers/net/ppp.c linux/drivers/net/ppp.c
@@ -180,10 +180,7 @@
 static int ppp_dev_close (struct device *);
 static int ppp_dev_xmit (sk_buff *, struct device *);
 static struct enet_statistics *ppp_dev_stats (struct device *);
-static int ppp_dev_header (sk_buff *, struct device *, __u16,
-			   void *, void *, unsigned int);
-static int ppp_dev_rebuild (void *eth, struct device *dev,
-                            unsigned long raddr, struct sk_buff *skb);
+
 /*
  * TTY callbacks
  */
@@ -389,8 +386,6 @@
 {
 	int    indx;
 
-	dev->hard_header      = ppp_dev_header;
-	dev->rebuild_header   = ppp_dev_rebuild;
 	dev->hard_header_len  = PPP_HARD_HDR_LEN;
 
 	/* device INFO */
@@ -1209,7 +1204,6 @@
 /*
  * Tag the frame and kick it to the proper receive routine
  */
-	skb->free = 1;
 	ppp->ddinfo.recv_idle = jiffies;
 	netif_rx (skb);
 	return 1;
@@ -3167,20 +3161,6 @@
 	if (ppp->flags & SC_DEBUG)
 		printk (KERN_INFO "ppp_dev_stats called");
 	return &ppp_stats;
-}
-
-static int ppp_dev_header (sk_buff *skb, struct device *dev,
-			   __u16 type, void *daddr,
-			   void *saddr, unsigned int len)
-{
-	return (0);
-}
-
-static int
-ppp_dev_rebuild (void *eth, struct device *dev,
-                 unsigned long raddr, struct sk_buff *skb)
-{
-	return (0);
 }
 
 /*************************************************************

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov