From 91fd141a821431f0a8ccae59857d7216390b2aee Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Sat, 17 May 2008 21:10:11 -0700
Subject: [PATCH] --- yaml --- r: 102637 b: refs/heads/master c:
 8047637c70e4451e2ac1c17ed9a91a2f753daae7 h: refs/heads/master i:   102635:
 4329a048ad7d299db74c31417516510b12b54a34 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2e4a8edc4ae3..b79cc77027a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0883beca7f39ab0c6447af35080e5caaa07418e3
+refs/heads/master: 8047637c70e4451e2ac1c17ed9a91a2f753daae7
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index 5e3b942fb515..2a0039f19377 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -2433,9 +2433,6 @@ static int bond_has_this_ip(struct bonding *bond, __be32 ip)
 	if (ip == bond->master_ip)
 		return 1;
 
-	if (list_empty(&bond->vlan_list))
-		return 0;
-
 	list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
 		if (ip == vlan->vlan_ip)
 			return 1;
@@ -3495,9 +3492,6 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event,
 			}
 		}
 
-		if (list_empty(&bond->vlan_list))
-			continue;
-
 		list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {
 			vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);
 			if (vlan_dev == event_dev) {