patch-2.3.99-pre7 linux/drivers/net/hamradio/baycom_epp.c

• Lines: 50
• Date: Thu May 4 11:31:21 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/hamradio/baycom_epp.c
• Orig date: Wed Apr 26 16:34:08 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/hamradio/baycom_epp.c linux/drivers/net/hamradio/baycom_epp.c
@@ -200,8 +200,6 @@
 	unsigned int bitrate;
 	unsigned char stat;
 
-	char ifname[HDLCDRV_IFNAMELEN];
-
 	struct {
 		unsigned int intclk;
 		unsigned int fclk;
@@ -444,7 +442,7 @@
 {
 
 #ifdef KISS_VERBOSE
-#define PKP(a,b) printk(KERN_INFO "%s: channel params: " a "\n", bc->ifname, b)
+#define PKP(a,b) printk(KERN_INFO "baycomm_epp: channel params: " a "\n", b)
 #else /* KISS_VERBOSE */	      
 #define PKP(a,b) 
 #endif /* KISS_VERBOSE */	      
@@ -702,7 +700,7 @@
 		return;
 	pktlen = bc->hdlcrx.bufcnt-2+1; /* KISS kludge */
 	if (!(skb = dev_alloc_skb(pktlen))) {
-		printk("%s: memory squeeze, dropping packet\n", bc->ifname);
+		printk("%s: memory squeeze, dropping packet\n", dev->name);
 		bc->stats.rx_dropped++;
 		return;
 	}
@@ -1450,20 +1448,19 @@
 		 */
 		memset(bc, 0, sizeof(struct baycom_state));
 		bc->magic = BAYCOM_MAGIC;
-		sprintf(bc->ifname, "bce%d", i);
+		sprintf(dev->name, "bce%d", i);
 		bc->cfg.fclk = 19666600;
 		bc->cfg.bps = 9600;
 		/*
 		 * initialize part of the device struct
 		 */
-		dev->name = bc->ifname;
 		dev->if_port = 0;
 		dev->init = baycom_probe;
 		dev->base_addr = iobase[i];
 		dev->irq = 0;
 		dev->dma = 0;
 		if (register_netdev(dev)) {
-			printk(KERN_WARNING "%s: cannot register net device %s\n", bc_drvname, bc->ifname);
+			printk(KERN_WARNING "%s: cannot register net device %s\n", bc_drvname, dev->name);
 			kfree(dev->priv);
 			return -ENXIO;
 		}