patch-2.4.13 linux/net/ax25/ax25_ip.c

• Lines: 26
• Date: Fri Oct 12 14:22:49 2001
• Orig file: v2.4.12/linux/net/ax25/ax25_ip.c
• Orig date: Tue Jul 3 17:08:22 2001

diff -u --recursive --new-file v2.4.12/linux/net/ax25/ax25_ip.c linux/net/ax25/ax25_ip.c
@@ -56,9 +56,14 @@
 
 int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
 {
-  	/* header is an AX.25 UI frame from us to them */
- 	unsigned char *buff = skb_push(skb, AX25_HEADER_LEN);
+	unsigned char *buff;
+
+	/* they sometimes come back to us... */
+	if (type == ETH_P_AX25)
+		return 0;
 
+  	/* header is an AX.25 UI frame from us to them */
+ 	buff = skb_push(skb, AX25_HEADER_LEN);
   	*buff++ = 0x00;	/* KISS DATA */
 
 	if (daddr != NULL)
@@ -90,7 +95,7 @@
   			*buff++ = AX25_P_ARP;
   			break;
   		default:
-  			printk(KERN_ERR "AX.25: ax25_encapsulate - wrong protocol type 0x%x2.2\n", type);
+  			printk(KERN_ERR "AX.25: ax25_encapsulate - wrong protocol type 0x%2.2x\n", type);
   			*buff++ = 0;
   			break;
  	}