Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9c3bf08189bd4c0675032f5d3ca9dcb42cbb3ec8

Authored by Sven Eckelmann
Committed by Antonio Quartulli
1 parent 4a13147cb5

batman-adv: Rename batadv_softif_vlan *_free_ref function to *_put 

The batman-adv source code is the only place in the kernel which uses the
*_free_ref naming scheme for the *_put functions. Changing it to *_put
makes it more consistent and makes it easier to understand the connection
to the *_get functions.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>

Showing 5 changed files with 21 additions and 21 deletions Side-by-side Diff

net/batman-adv/main.c
Diff comments   View file @ 9c3bf08
... ... @@ -1261,7 +1261,7 @@
1261 1261 vlan = batadv_softif_vlan_get(bat_priv, vid);
1262 1262 if (vlan) {
1263 1263 ap_isolation_enabled = atomic_read(&vlan->ap_isolation);
1264   - batadv_softif_vlan_free_ref(vlan);
  1264 + batadv_softif_vlan_put(vlan);
1265 1265 }
1266 1266  
1267 1267 return ap_isolation_enabled;
net/batman-adv/soft-interface.c
Diff comments   View file @ 9c3bf08
... ... @@ -497,11 +497,11 @@
497 497 }
498 498  
499 499 /**
500   - * batadv_softif_vlan_free_ref - decrease the vlan object refcounter and
  500 + * batadv_softif_vlan_put - decrease the vlan object refcounter and
501 501 * possibly release it
502 502 * @vlan: the vlan object to release
503 503 */
504   -void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan)
  504 +void batadv_softif_vlan_put(struct batadv_softif_vlan *vlan)
505 505 {
506 506 if (!vlan)
507 507 return;
... ... @@ -552,7 +552,7 @@
552 552  
553 553 vlan = batadv_softif_vlan_get(bat_priv, vid);
554 554 if (vlan) {
555   - batadv_softif_vlan_free_ref(vlan);
  555 + batadv_softif_vlan_put(vlan);
556 556 return -EEXIST;
557 557 }
558 558  
... ... @@ -601,7 +601,7 @@
601 601 vlan->vid, "vlan interface destroyed", false);
602 602  
603 603 batadv_sysfs_del_vlan(bat_priv, vlan);
604   - batadv_softif_vlan_free_ref(vlan);
  604 + batadv_softif_vlan_put(vlan);
605 605 }
606 606  
607 607 /**
... ... @@ -646,7 +646,7 @@
646 646 if (!vlan->kobj) {
647 647 ret = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan);
648 648 if (ret) {
649   - batadv_softif_vlan_free_ref(vlan);
  649 + batadv_softif_vlan_put(vlan);
650 650 return ret;
651 651 }
652 652 }
... ... @@ -693,7 +693,7 @@
693 693 batadv_softif_destroy_vlan(bat_priv, vlan);
694 694  
695 695 /* finally free the vlan object */
696   - batadv_softif_vlan_free_ref(vlan);
  696 + batadv_softif_vlan_put(vlan);
697 697  
698 698 return 0;
699 699 }
... ... @@ -749,7 +749,7 @@
749 749 vlan = batadv_softif_vlan_get(bat_priv, BATADV_NO_FLAGS);
750 750 if (vlan) {
751 751 batadv_softif_destroy_vlan(bat_priv, vlan);
752   - batadv_softif_vlan_free_ref(vlan);
  752 + batadv_softif_vlan_put(vlan);
753 753 }
754 754  
755 755 batadv_sysfs_del_meshif(soft_iface);
net/batman-adv/soft-interface.h
Diff comments   View file @ 9c3bf08
... ... @@ -34,7 +34,7 @@
34 34 int batadv_softif_is_valid(const struct net_device *net_dev);
35 35 extern struct rtnl_link_ops batadv_link_ops;
36 36 int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid);
37   -void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan);
  37 +void batadv_softif_vlan_put(struct batadv_softif_vlan *softif_vlan);
38 38 struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv,
39 39 unsigned short vid);
40 40  
net/batman-adv/sysfs.c
Diff comments   View file @ 9c3bf08
... ... @@ -216,7 +216,7 @@
216 216 attr, &vlan->_name, \
217 217 bat_priv->soft_iface); \
218 218 \
219   - batadv_softif_vlan_free_ref(vlan); \
  219 + batadv_softif_vlan_put(vlan); \
220 220 return res; \
221 221 }
222 222  
... ... @@ -231,7 +231,7 @@
231 231 atomic_read(&vlan->_name) == 0 ? \
232 232 "disabled" : "enabled"); \
233 233 \
234   - batadv_softif_vlan_free_ref(vlan); \
  234 + batadv_softif_vlan_put(vlan); \
235 235 return res; \
236 236 }
237 237  
net/batman-adv/translation-table.c
Diff comments   View file @ 9c3bf08
... ... @@ -301,7 +301,7 @@
301 301  
302 302 atomic_add(v, &vlan->tt.num_entries);
303 303  
304   - batadv_softif_vlan_free_ref(vlan);
  304 + batadv_softif_vlan_put(vlan);
305 305 }
306 306  
307 307 /**
... ... @@ -688,7 +688,7 @@
688 688 if (unlikely(hash_added != 0)) {
689 689 /* remove the reference for the hash */
690 690 batadv_tt_local_entry_free_ref(tt_local);
691   - batadv_softif_vlan_free_ref(vlan);
  691 + batadv_softif_vlan_put(vlan);
692 692 goto out;
693 693 }
694 694  
... ... @@ -1054,7 +1054,7 @@
1054 1054 no_purge ? 0 : last_seen_msecs,
1055 1055 vlan->tt.crc);
1056 1056  
1057   - batadv_softif_vlan_free_ref(vlan);
  1057 + batadv_softif_vlan_put(vlan);
1058 1058 }
1059 1059 rcu_read_unlock();
1060 1060 }
... ... @@ -1144,8 +1144,8 @@
1144 1144 if (!vlan)
1145 1145 goto out;
1146 1146  
1147   - batadv_softif_vlan_free_ref(vlan);
1148   - batadv_softif_vlan_free_ref(vlan);
  1147 + batadv_softif_vlan_put(vlan);
  1148 + batadv_softif_vlan_put(vlan);
1149 1149  
1150 1150 out:
1151 1151 if (tt_local_entry)
... ... @@ -1245,8 +1245,8 @@
1245 1245 vlan = batadv_softif_vlan_get(bat_priv,
1246 1246 tt_common_entry->vid);
1247 1247 if (vlan) {
1248   - batadv_softif_vlan_free_ref(vlan);
1249   - batadv_softif_vlan_free_ref(vlan);
  1248 + batadv_softif_vlan_put(vlan);
  1249 + batadv_softif_vlan_put(vlan);
1250 1250 }
1251 1251  
1252 1252 batadv_tt_local_entry_free_ref(tt_local);
... ... @@ -3342,8 +3342,8 @@
3342 3342 /* decrease the reference held for this vlan */
3343 3343 vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid);
3344 3344 if (vlan) {
3345   - batadv_softif_vlan_free_ref(vlan);
3346   - batadv_softif_vlan_free_ref(vlan);
  3345 + batadv_softif_vlan_put(vlan);
  3346 + batadv_softif_vlan_put(vlan);
3347 3347 }
3348 3348  
3349 3349 batadv_tt_local_entry_free_ref(tt_local);
... ... @@ -3429,7 +3429,7 @@
3429 3429 ret = true;
3430 3430  
3431 3431 out:
3432   - batadv_softif_vlan_free_ref(vlan);
  3432 + batadv_softif_vlan_put(vlan);
3433 3433 if (tt_global_entry)
3434 3434 batadv_tt_global_entry_free_ref(tt_global_entry);
3435 3435 if (tt_local_entry)