patch-2.3.14 linux/drivers/net/ppp_generic.c

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

diff -u --recursive --new-file v2.3.13/linux/drivers/net/ppp_generic.c linux/drivers/net/ppp_generic.c
@@ -94,7 +94,7 @@
 	void		*rc_state;	/* its internal state */
 	unsigned long	last_xmit;	/* jiffies when last pkt sent */
 	unsigned long	last_recv;	/* jiffies when last pkt rcvd */
-	struct device	dev;		/* network interface device */
+	struct net_device	dev;		/* network interface device */
 	struct net_device_stats stats;	/* statistics */
 };
 
@@ -575,7 +575,7 @@
 /* Called at boot time if ppp is compiled into the kernel,
    or at module load time (from init_module) if compiled as a module. */
 int
-ppp_init(struct device *dev)
+ppp_init(struct net_device *dev)
 {
 	int err;
 #ifndef MODULE
@@ -605,7 +605,7 @@
  * Network interface unit routines.
  */
 static int
-ppp_start_xmit(struct sk_buff *skb, struct device *dev)
+ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct ppp *ppp = (struct ppp *) dev->priv;
 	int npi, proto;
@@ -678,7 +678,7 @@
 }
 
 static struct net_device_stats *
-ppp_net_stats(struct device *dev)
+ppp_net_stats(struct net_device *dev)
 {
 	struct ppp *ppp = (struct ppp *) dev->priv;
 
@@ -686,7 +686,7 @@
 }
 
 static int
-ppp_net_ioctl(struct device *dev, struct ifreq *ifr, int cmd)
+ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	struct ppp *ppp = dev->priv;
 	int err = -EFAULT;
@@ -729,7 +729,7 @@
 }
 
 int
-ppp_net_init(struct device *dev)
+ppp_net_init(struct net_device *dev)
 {
 	dev->hard_header_len = PPP_HDRLEN;
 	dev->mtu = PPP_MTU;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)