aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_3ad.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index da0d7c54d352..b49f421346a7 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -143,11 +143,13 @@ static inline struct bonding *__get_bond_by_port(struct port *port)
143 * 143 *
144 * Return the aggregator of the first slave in @bond, or %NULL if it can't be 144 * Return the aggregator of the first slave in @bond, or %NULL if it can't be
145 * found. 145 * found.
146 * The caller must hold RCU or RTNL lock.
146 */ 147 */
147static inline struct aggregator *__get_first_agg(struct port *port) 148static inline struct aggregator *__get_first_agg(struct port *port)
148{ 149{
149 struct bonding *bond = __get_bond_by_port(port); 150 struct bonding *bond = __get_bond_by_port(port);
150 struct slave *first_slave; 151 struct slave *first_slave;
152 struct aggregator *agg;
151 153
152 /* If there's no bond for this port, or bond has no slaves */ 154 /* If there's no bond for this port, or bond has no slaves */
153 if (bond == NULL) 155 if (bond == NULL)
@@ -155,9 +157,10 @@ static inline struct aggregator *__get_first_agg(struct port *port)
155 157
156 rcu_read_lock(); 158 rcu_read_lock();
157 first_slave = bond_first_slave_rcu(bond); 159 first_slave = bond_first_slave_rcu(bond);
160 agg = first_slave ? &(SLAVE_AD_INFO(first_slave).aggregator) : NULL;
158 rcu_read_unlock(); 161 rcu_read_unlock();
159 162
160 return first_slave ? &(SLAVE_AD_INFO(first_slave).aggregator) : NULL; 163 return agg;
161} 164}
162 165
163/** 166/**