mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 14:27:48 +00:00
Koen Kooi
df420fe6fd
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denis@denix.org>
84 lines
2.2 KiB
Diff
84 lines
2.2 KiB
Diff
From ed8467f422e2d17a05fbe02b149780199a683d11 Mon Sep 17 00:00:00 2001
|
|
From: Alan Cox <alan@linux.intel.com>
|
|
Date: Tue, 24 Jul 2012 08:16:25 +0000
|
|
Subject: [PATCH 07/38] wanmain: comparing array with NULL
|
|
|
|
[ Upstream commit 8b72ff6484fe303e01498b58621810a114f3cf09 ]
|
|
|
|
gcc really should warn about these !
|
|
|
|
Signed-off-by: Alan Cox <alan@linux.intel.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
net/wanrouter/wanmain.c | 51 +++++++++++++++++++++-------------------------
|
|
1 files changed, 23 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
|
|
index 788a12c..2ab7850 100644
|
|
--- a/net/wanrouter/wanmain.c
|
|
+++ b/net/wanrouter/wanmain.c
|
|
@@ -602,36 +602,31 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
|
|
* successfully, add it to the interface list.
|
|
*/
|
|
|
|
- if (dev->name == NULL) {
|
|
- err = -EINVAL;
|
|
- } else {
|
|
+#ifdef WANDEBUG
|
|
+ printk(KERN_INFO "%s: registering interface %s...\n",
|
|
+ wanrouter_modname, dev->name);
|
|
+#endif
|
|
|
|
- #ifdef WANDEBUG
|
|
- printk(KERN_INFO "%s: registering interface %s...\n",
|
|
- wanrouter_modname, dev->name);
|
|
- #endif
|
|
-
|
|
- err = register_netdev(dev);
|
|
- if (!err) {
|
|
- struct net_device *slave = NULL;
|
|
- unsigned long smp_flags=0;
|
|
-
|
|
- lock_adapter_irq(&wandev->lock, &smp_flags);
|
|
-
|
|
- if (wandev->dev == NULL) {
|
|
- wandev->dev = dev;
|
|
- } else {
|
|
- for (slave=wandev->dev;
|
|
- DEV_TO_SLAVE(slave);
|
|
- slave = DEV_TO_SLAVE(slave))
|
|
- DEV_TO_SLAVE(slave) = dev;
|
|
- }
|
|
- ++wandev->ndev;
|
|
-
|
|
- unlock_adapter_irq(&wandev->lock, &smp_flags);
|
|
- err = 0; /* done !!! */
|
|
- goto out;
|
|
+ err = register_netdev(dev);
|
|
+ if (!err) {
|
|
+ struct net_device *slave = NULL;
|
|
+ unsigned long smp_flags=0;
|
|
+
|
|
+ lock_adapter_irq(&wandev->lock, &smp_flags);
|
|
+
|
|
+ if (wandev->dev == NULL) {
|
|
+ wandev->dev = dev;
|
|
+ } else {
|
|
+ for (slave=wandev->dev;
|
|
+ DEV_TO_SLAVE(slave);
|
|
+ slave = DEV_TO_SLAVE(slave))
|
|
+ DEV_TO_SLAVE(slave) = dev;
|
|
}
|
|
+ ++wandev->ndev;
|
|
+
|
|
+ unlock_adapter_irq(&wandev->lock, &smp_flags);
|
|
+ err = 0; /* done !!! */
|
|
+ goto out;
|
|
}
|
|
if (wandev->del_if)
|
|
wandev->del_if(wandev, dev);
|
|
--
|
|
1.7.7.6
|
|
|