From f72cea5a303d503d62945955ad739a6f7c376cf7 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 17 Aug 2009 18:05:32 -0700
Subject: [PATCH] --- yaml --- r: 156919 b: refs/heads/master c:
 c6ba973b8fa97422aab4204f7d79f1d413cde925 h: refs/heads/master i:   156917:
 33c3b4c640109a59b6b537de3b9eb031bac0550e   156915:
 a87398aa4f9ae83f8e5971fd7bbc8154c83784e8   156911:
 5ca3b012e595984abbb12a3ea99c84ea5a5f7385 v: v3

---
 [refs]                      |  2 +-
 trunk/net/netrom/nr_route.c | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a9310f187a75..d39e81e16c2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68eac4602b9104cdaa6c18b3edd914cececa6a1e
+refs/heads/master: c6ba973b8fa97422aab4204f7d79f1d413cde925
diff --git a/trunk/net/netrom/nr_route.c b/trunk/net/netrom/nr_route.c
index e943c16552a2..4eb1ac9a7679 100644
--- a/trunk/net/netrom/nr_route.c
+++ b/trunk/net/netrom/nr_route.c
@@ -630,23 +630,23 @@ struct net_device *nr_dev_get(ax25_address *addr)
 	return dev;
 }
 
-static ax25_digi *nr_call_to_digi(int ndigis, ax25_address *digipeaters)
+static ax25_digi *nr_call_to_digi(ax25_digi *digi, int ndigis,
+	ax25_address *digipeaters)
 {
-	static ax25_digi ax25_digi;
 	int i;
 
 	if (ndigis == 0)
 		return NULL;
 
 	for (i = 0; i < ndigis; i++) {
-		ax25_digi.calls[i]    = digipeaters[i];
-		ax25_digi.repeated[i] = 0;
+		digi->calls[i]    = digipeaters[i];
+		digi->repeated[i] = 0;
 	}
 
-	ax25_digi.ndigi      = ndigis;
-	ax25_digi.lastrepeat = -1;
+	digi->ndigi      = ndigis;
+	digi->lastrepeat = -1;
 
-	return &ax25_digi;
+	return digi;
 }
 
 /*
@@ -656,6 +656,7 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg)
 {
 	struct nr_route_struct nr_route;
 	struct net_device *dev;
+	ax25_digi digi;
 	int ret;
 
 	switch (cmd) {
@@ -673,13 +674,15 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg)
 			ret = nr_add_node(&nr_route.callsign,
 				nr_route.mnemonic,
 				&nr_route.neighbour,
-				nr_call_to_digi(nr_route.ndigis, nr_route.digipeaters),
+				nr_call_to_digi(&digi, nr_route.ndigis,
+						nr_route.digipeaters),
 				dev, nr_route.quality,
 				nr_route.obs_count);
 			break;
 		case NETROM_NEIGH:
 			ret = nr_add_neigh(&nr_route.callsign,
-				nr_call_to_digi(nr_route.ndigis, nr_route.digipeaters),
+				nr_call_to_digi(&digi, nr_route.ndigis,
+						nr_route.digipeaters),
 				dev, nr_route.quality);
 			break;
 		default: