diff options
| author |   Sven Eckelmann <sven@narfation.org> | 2012-07-08 17:13:15 +0200 |
|---|---|---|
| committer |   Antonio Quartulli <ordex@autistici.org> | 2012-08-23 14:20:20 +0200 |
| commit | bbb1f90efba89b31fc5e329d5fcaf10aca99212b (patch) | |
| tree | db2645f7068d5da5b501559e6a2972c20f361082 /net/batman-adv/bridge_loop_avoidance.c | |
| parent | batman-adv: Use BIT(x) macro to calculate bit positions (diff) | |
| download | linux-dev-bbb1f90efba89b31fc5e329d5fcaf10aca99212b.tar.xz linux-dev-bbb1f90efba89b31fc5e329d5fcaf10aca99212b.zip | |
batman-adv: Don't break statements after assignment operator
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net/batman-adv/bridge_loop_avoidance.c')
| -rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index ad18017da4e7..7a93b2ae3a9b 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -579,8 +579,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, "bla_add_claim(): changing ownership for %pM, vid %d\n", mac, vid); - claim->backbone_gw->crc ^= - crc16(0, claim->addr, ETH_ALEN); + claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN); batadv_backbone_gw_free_ref(claim->backbone_gw); } @@ -1102,8 +1101,7 @@ static void batadv_bla_start_timer(struct batadv_priv *bat_priv) */ static void batadv_bla_periodic_work(struct work_struct *work) { - struct delayed_work *delayed_work = - container_of(work, struct delayed_work, work); + struct delayed_work *delayed_work; struct batadv_priv *bat_priv; struct batadv_priv_bla *priv_bla; struct hlist_node *node; @@ -1113,6 +1111,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) struct batadv_hard_iface *primary_if; int i; + delayed_work = container_of(work, struct delayed_work, work); priv_bla = container_of(delayed_work, struct batadv_priv_bla, work); bat_priv = container_of(priv_bla, struct batadv_priv, bla); primary_if = batadv_primary_if_get_selected(bat_priv); |