Skip to contentSkip to conversation

batman-adv: fix alignment

PATCH Applied Antonio Quartulli 2 participants 4 messages May 15, 2014

lore
Share & tools
lore

Antonio Quartulli

author
#0 lore raw

PATCH 1/2 batman-adv: fix alignment

Introduced by 9729d2085c0fa4398eb1ee518b0097866dfdcd77 ("batman-adv: fix TT VLAN inconsistency on VLAN re-add")

Signed-off-by Antonio Quartulli <[email protected]>
---
 soft-interface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
soft-interface.c +2 -2
index 5a9dc2f..82804e7 100644
@@ -594,8 +594,8 @@ static int batadv_interface_add_vid(struct net_device *dev, __be16 proto,
 	 * exists, because the entry was deleted by kill_vid()
 	 */
 	batadv_tt_local_add(bat_priv->soft_iface,
-			     bat_priv->soft_iface->dev_addr, vid,
-			     BATADV_NULL_IFINDEX, BATADV_NO_MARK);
+			    bat_priv->soft_iface->dev_addr, vid,
+			    BATADV_NULL_IFINDEX, BATADV_NO_MARK);
 
 	return 0;
 }
Signature · 1 line
1.8.5.5
author
#1 lore raw

PATCH 2/2 batman-adv: fix var name to keep compatibility with old kernels

The first argument of kfree_rcu() is used in compat.h to forge a function name used by old kernels. Keep it as it was before to avoid breaking this compat mechanism.

Introduced by 9729d2085c0fa4398eb1ee518b0097866dfdcd77 ("batman-adv: fix TT VLAN inconsistency on VLAN re-add")

Signed-off-by Antonio Quartulli <[email protected]>
---
 soft-interface.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
soft-interface.c +6 -6
index 82804e7..a4e6e5e 100644
@@ -437,14 +437,14 @@ out:
  *  possibly free it
  * @softif_vlan: the vlan object to release
  */
-void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan)
+void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan)
 {
-	if (atomic_dec_and_test(&vlan->refcount)) {
-		spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock);
-		hlist_del_rcu(&vlan->list);
-		spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock);
+	if (atomic_dec_and_test(&softif_vlan->refcount)) {
+		spin_lock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock);
+		hlist_del_rcu(&softif_vlan->list);
+		spin_unlock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock);
 
-		kfree_rcu(vlan, rcu);
+		kfree_rcu(softif_vlan, rcu);
 	}
 }
Signature · 1 line
1.8.5.5
Applied
#2 lore raw

Re: [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: fix var name to keep compatibility with old kernels

Quoted 11 lines · On Thursday 15 May 2014 11:08:07 Antonio Quartulli wrote:

The first argument of kfree_rcu() is used in compat.h to forge a function name used by old kernels. Keep it as it was before to avoid breaking this compat mechanism.

Introduced by 9729d2085c0fa4398eb1ee518b0097866dfdcd77 ("batman-adv: fix TT VLAN inconsistency on VLAN re-add")

Signed-off-by Antonio Quartulli <[email protected]>
---
 soft-interface.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Applied in revision b539153.

Thanks,
Marek