patch-2.1.16 linux/drivers/net/bpqether.c

• Lines: 55
• Date: Sat Dec 14 13:40:11 1996
• Orig file: v2.1.15/linux/drivers/net/bpqether.c
• Orig date: Thu Dec 12 19:37:05 1996

diff -u --recursive --new-file v2.1.15/linux/drivers/net/bpqether.c linux/drivers/net/bpqether.c
@@ -53,6 +53,8 @@
  *						and accepted source address
  *						can be configured by an ioctl()
  *						call.
+ *						Fixed to match Linux networking
+ *						changes - 2.1.15.
  */
 
 #include <linux/config.h>
@@ -329,7 +331,7 @@
 /*
  *	Statistics
  */
-static struct enet_statistics * bpq_get_stats(struct device *dev)
+static struct enet_statistics *bpq_get_stats(struct device *dev)
 {
 	struct bpqdev *bpq;
 
@@ -338,15 +340,6 @@
 	return &bpq->stats;
 }
 
-
-/*
- *	Rebuild header...
- */
-static int bpq_rebuild_header(void *buff, struct device *dev, unsigned long raddr, struct sk_buff *skb)
-{
-	return ax25_rebuild_header((unsigned char *)buff, dev, raddr, skb);
-}
-
 /*
  *	Set AX.25 callsign
  */
@@ -554,8 +547,6 @@
 		skb_queue_head_init(&dev->buffs[k]);
 
 	dev->hard_start_xmit = bpq_xmit;
-	dev->hard_header     = ax25_encapsulate;
-	dev->rebuild_header  = bpq_rebuild_header;
 	dev->open	     = bpq_open;
 	dev->stop	     = bpq_close;
 	dev->set_mac_address = bpq_set_mac_address;
@@ -574,6 +565,11 @@
 	dev->pa_brdaddr = 0;
 	dev->pa_mask    = 0;
 	dev->pa_alen    = 4;
+#endif
+
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+	dev->hard_header     = ax25_encapsulate;
+	dev->rebuild_header  = ax25_rebuild_header;
 #endif
 
 	dev->type            = ARPHRD_AX25;