Skip to contentSkip to conversation

Trivial compilation CONFIG_INET=n case

PATCH Applied Pavel Emelyanov 3 participants 4 messages Dec 4, 2007 – Dec 9, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Trivial compilation CONFIG_INET=n case

The rose_rebuild_header() consists only of some variables in case INET=n, and gcc will warn us about it.

Fits both net-2.6 and net-2.6.25.

---

net/rose/rose_dev.c +1 -1
index 1b6741f..12cfcf0 100644
@@ -55,13 +55,13 @@ static int rose_header(struct sk_buff *skb, struct net_device *dev,
 
 static int rose_rebuild_header(struct sk_buff *skb)
 {
+#ifdef CONFIG_INET
 	struct net_device *dev = skb->dev;
 	struct net_device_stats *stats = netdev_priv(dev);
 	unsigned char *bp = (unsigned char *)skb->data;
 	struct sk_buff *skbn;
 	unsigned int len;
 
-#ifdef CONFIG_INET
 	if (arp_find(bp + 7, skb)) {
 		return 1;
 	}
Signature · 1 line
1.5.3.4
maintainer Applied
#1 lore raw

From: Pavel Emelyanov <[email protected]>
Date: Tue, 04 Dec 2007 18:11:05 +0300

Quoted 6 lines

The rose_rebuild_header() consists only of some variables in case INET=n, and gcc will warn us about it.

Fits both net-2.6 and net-2.6.25.

Applied to net-2.6, thanks.

#2 lore raw

PATCH 1/1 ax25ipd (ax25-apps-0.0.6.2)

Hi,

Rose network is using extensively AX25 IP encapsulation for routing AX25 packet radio frames via Internet nodes such FPAC nodes.

ax25ipd (from ax25-apps) is doing frame encapsulation and decapsulation.

Since version 1.0.3 patch by vk5asf ax25ipd is checking every 5 minutes hostnames for dynamic DNS.

There was still a failure possibility when the program is started in case of unsuccessful resolving remote host ip from its hostname was unsuccessful.

I introduced a simple error warning instead of an exit as the remote host could be temporary down and the address will be checked again periodically later.

The patch against ax25-apps-0.0.6.2 (kernel 2.6 compatible) can be found here :

http://f6bvp.free.fr/logiciels/ax25/ax25-apps-0.0.6.2.diff

and ax25-apps-0.0.6.2 is here :
http://f6bvp.free.fr/logiciels/ax25/ax25-apps-0.0.6.2src_f6bvp.tgz

73 de Bernard, f6bvp

#3 lore raw

PATCH 1/1 ax25ipd (ax25-apps-0.0.6.2)

In reply to David Miller

Hi,

I found that my previous patch for ax25ipd did not give good results. Here is the new patch.

ax25ipd.h +1 -1
diff -ruN ax25-apps-0.0.6.2/ax25ipd/ax25ipd.h ax25-apps-0.0.6.2b/ax25ipd/ax25ipd.h
@@ -41,7 +41,7 @@
  *
  */
 
-#define VERS2 "Version 1.0.3"
+#define VERS2 "Version 1.0.5"
 
 #define IPPROTO_AX25 93
 #define DEFAULT_UDP_PORT 10093
config.c +2 -2
diff -ruN ax25-apps-0.0.6.2/ax25ipd/config.c ax25-apps-0.0.6.2b/ax25ipd/config.c
@@ -310,8 +310,8 @@
                         strncpy(thost,q,255);
                         thost[255]=0;
                    } else {
-                        return -5;
-                        }
+			fprintf(stderr,"ax25ipd: %s host IP address unknown - will probe it again later\n",q);
+		   }
 		}
 
 		while ((q = strtok(NULL, " \t\n\r")) != NULL) {
HISTORY.ax25ipd +0 -0
diff -ruN ax25-apps-0.0.6.2/ax25ipd/HISTORY.ax25ipd ax25-apps-0.0.6.2b/ax25ipd/HISTORY.ax25ipd
@@ -49,6 +49,11 @@
  *              on UDP port. Also deleted exit(3) for errors occuring 

with
* kiss serial port (f6bvp).
*
+ * 1.0.4 when started the program stopped if resolving host ip from
+ * its hostname was unsuccessful (f6bvp).
+ * Replaced this by a simple error warning as the remote host could
+ * be temporary down and the address will be checked again later.
+ *

  *      July97  Added support for broadcast addresses and routes.
  *              Converted route array to a linked list and removed the
  *              maximum route limitations. (vk2ktj)

73 de Bernard, f6bvp