diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-20 14:28:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-20 14:28:58 -0700 |
| commit | f643776e4d1906ceff59f18315d6aba8e85db343 (patch) | |
| tree | 41abc4a03a50aede07e2f59021494894d9716d32 /drivers/net/team/team_mode_activebackup.c | |
| parent | d8dbd96e507e1f1133d346be123e7be4b16b72c3 (diff) | |
| download | talos-obmc-linux-f643776e4d1906ceff59f18315d6aba8e85db343.tar.gz talos-obmc-linux-f643776e4d1906ceff59f18315d6aba8e85db343.zip | |
team: Revert previous two changes.
I didn't notice that these were superceded by a more uptodate
version of the changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team/team_mode_activebackup.c')
| -rw-r--r-- | drivers/net/team/team_mode_activebackup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/team/team_mode_activebackup.c b/drivers/net/team/team_mode_activebackup.c index c9e7621b4480..2fe02a8713ea 100644 --- a/drivers/net/team/team_mode_activebackup.c +++ b/drivers/net/team/team_mode_activebackup.c @@ -61,11 +61,8 @@ static void ab_port_leave(struct team *team, struct team_port *port) static int ab_active_port_get(struct team *team, struct team_gsetter_ctx *ctx) { - struct team_port *active_port; - - active_port = rcu_access_pointer(ab_priv(team)->active_port); - if (active_port) - ctx->data.u32_val = active_port->dev->ifindex; + if (ab_priv(team)->active_port) + ctx->data.u32_val = ab_priv(team)->active_port->dev->ifindex; else ctx->data.u32_val = 0; return 0; |
