From 032336d6a4e5d4745eb5f76cc5ceeae637fb5b5c Mon Sep 17 00:00:00 2001
From: Jon Paul Maloy <jon.maloy@ericsson.com>
Date: Wed, 23 May 2007 15:11:15 -0700
Subject: [PATCH] --- yaml --- r: 56979 b: refs/heads/master c:
 cb283ead710c342d9856af8507e2a42bf5c6576c h: refs/heads/master i:   56977:
 6b503b028f0a55175923b1ac803eb2a23376f440   56975:
 436346390d59dfa14c84104145743831d4f0ebc7 v: v3

---
 [refs]                     |  2 +-
 trunk/net/tipc/eth_media.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0a112416fb30..4354b07758ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8f558313506b5bc435f2e031f3bec4b1725098e
+refs/heads/master: cb283ead710c342d9856af8507e2a42bf5c6576c
diff --git a/trunk/net/tipc/eth_media.c b/trunk/net/tipc/eth_media.c
index 0ee6ded18f3a..77d2d9ce8962 100644
--- a/trunk/net/tipc/eth_media.c
+++ b/trunk/net/tipc/eth_media.c
@@ -120,18 +120,20 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
 
 static int enable_bearer(struct tipc_bearer *tb_ptr)
 {
-	struct net_device *dev, *pdev;
+	struct net_device *dev = NULL;
+	struct net_device *pdev = NULL;
 	struct eth_bearer *eb_ptr = &eth_bearers[0];
 	struct eth_bearer *stop = &eth_bearers[MAX_ETH_BEARERS];
 	char *driver_name = strchr((const char *)tb_ptr->name, ':') + 1;
 
 	/* Find device with specified name */
-	dev = NULL;
-	for_each_netdev(pdev)
-		if (!strncmp(dev->name, driver_name, IFNAMSIZ)) {
+
+	for_each_netdev(pdev){
+		if (!strncmp(pdev->name, driver_name, IFNAMSIZ)) {
 			dev = pdev;
 			break;
 		}
+	}
 	if (!dev)
 		return -ENODEV;