patch-2.3.14 linux/drivers/net/hamradio/hdlcdrv.c

• Lines: 144
• Date: Wed Aug 18 11:38:50 1999
• Orig file: v2.3.13/linux/drivers/net/hamradio/hdlcdrv.c
• Orig date: Mon Aug 9 14:59:22 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/hamradio/hdlcdrv.c linux/drivers/net/hamradio/hdlcdrv.c
@@ -204,7 +204,7 @@
 	return added;
 }
 
-static void hdlc_rx_flag(struct device *dev, struct hdlcdrv_state *s)
+static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
 {
 	struct sk_buff *skb;
 	int pkt_len;
@@ -231,7 +231,7 @@
 	s->stats.rx_packets++;
 }
 
-void hdlcdrv_receiver(struct device *dev, struct hdlcdrv_state *s)
+void hdlcdrv_receiver(struct net_device *dev, struct hdlcdrv_state *s)
 {
 	int i;
 	unsigned int mask1, mask2, mask3, mask4, mask5, mask6, word;
@@ -328,7 +328,7 @@
 
 /* ---------------------------------------------------------------------- */
 
-void hdlcdrv_transmitter(struct device *dev, struct hdlcdrv_state *s)
+void hdlcdrv_transmitter(struct net_device *dev, struct hdlcdrv_state *s)
 {
 	unsigned int mask1, mask2, mask3;
 	int i;
@@ -430,7 +430,7 @@
 
 /* ---------------------------------------------------------------------- */
 
-static void start_tx(struct device *dev, struct hdlcdrv_state *s)
+static void start_tx(struct net_device *dev, struct hdlcdrv_state *s)
 {
 	s->hdlctx.tx_state = 0;
 	s->hdlctx.numflags = tenms_to_2flags(s, s->ch_params.tx_delay);
@@ -452,7 +452,7 @@
 
 /* ---------------------------------------------------------------------- */
 
-void hdlcdrv_arbitrate(struct device *dev, struct hdlcdrv_state *s)
+void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s)
 {
 	if (!s || s->magic != HDLCDRV_MAGIC || s->hdlctx.ptt || 
 	    skb_queue_empty(&s->send_queue)) 
@@ -478,7 +478,7 @@
  * ===================== network driver interface =========================
  */
 
-static inline int hdlcdrv_paranoia_check(struct device *dev,
+static inline int hdlcdrv_paranoia_check(struct net_device *dev,
 					const char *routine)
 {
 	if (!dev || !dev->priv || 
@@ -492,7 +492,7 @@
 
 /* --------------------------------------------------------------------- */
 
-static int hdlcdrv_send_packet(struct sk_buff *skb, struct device *dev)
+static int hdlcdrv_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
 	struct hdlcdrv_state *sm;
 
@@ -506,7 +506,7 @@
 
 /* --------------------------------------------------------------------- */
 
-static int hdlcdrv_set_mac_address(struct device *dev, void *addr)
+static int hdlcdrv_set_mac_address(struct net_device *dev, void *addr)
 {
 	struct sockaddr *sa = (struct sockaddr *)addr;
 
@@ -517,7 +517,7 @@
 
 /* --------------------------------------------------------------------- */
 
-static struct net_device_stats *hdlcdrv_get_stats(struct device *dev)
+static struct net_device_stats *hdlcdrv_get_stats(struct net_device *dev)
 {
 	struct hdlcdrv_state *sm;
 
@@ -541,7 +541,7 @@
  * there is non-reboot way to recover if something goes wrong.
  */
 
-static int hdlcdrv_open(struct device *dev)
+static int hdlcdrv_open(struct net_device *dev)
 {
 	struct hdlcdrv_state *s;
 	int i;
@@ -589,7 +589,7 @@
  * The inverse routine to hdlcdrv_open(). 
  */
 
-static int hdlcdrv_close(struct device *dev)
+static int hdlcdrv_close(struct net_device *dev)
 {
 	struct hdlcdrv_state *s;
 	struct sk_buff *skb;
@@ -614,7 +614,7 @@
 
 /* --------------------------------------------------------------------- */
 
-static int hdlcdrv_ioctl(struct device *dev, struct ifreq *ifr, int cmd)
+static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	struct hdlcdrv_state *s;
 	struct hdlcdrv_ioctl bi;
@@ -749,7 +749,7 @@
  * If dev->base_addr == 2, allocate space for the device and return success
  * (detachable devices only).
  */
-static int hdlcdrv_probe(struct device *dev)
+static int hdlcdrv_probe(struct net_device *dev)
 {
 	const struct hdlcdrv_channel_params dflt_ch_params = { 
 		20, 2, 10, 40, 0 
@@ -830,7 +830,7 @@
 
 /* --------------------------------------------------------------------- */
 
-int hdlcdrv_register_hdlcdrv(struct device *dev, const struct hdlcdrv_ops *ops,
+int hdlcdrv_register_hdlcdrv(struct net_device *dev, const struct hdlcdrv_ops *ops,
 			     unsigned int privsize, char *ifname,
 			     unsigned int baseaddr, unsigned int irq, 
 			     unsigned int dma) 
@@ -841,7 +841,7 @@
 		return -EACCES;
 	if (privsize < sizeof(struct hdlcdrv_state))
 		privsize = sizeof(struct hdlcdrv_state);
-	memset(dev, 0, sizeof(struct device));
+	memset(dev, 0, sizeof(struct net_device));
 	if (!(s = dev->priv = kmalloc(privsize, GFP_KERNEL)))
 		return -ENOMEM;
 	/*
@@ -874,7 +874,7 @@
 
 /* --------------------------------------------------------------------- */
 
-int hdlcdrv_unregister_hdlcdrv(struct device *dev) 
+int hdlcdrv_unregister_hdlcdrv(struct net_device *dev) 
 {
 	struct hdlcdrv_state *s;