Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 368761
b: refs/heads/master
c: e07932a
h: refs/heads/master
i:
  368759: a2124f2
v: v3
  • Loading branch information
Marek Lindner authored and Antonio Quartulli committed Mar 27, 2013
1 parent c713869 commit 2a58f50
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a15fd3612dd95341ad190def7faceebb41d6e346
refs/heads/master: e07932ae6fb74ef707b2b27762fb0ad8aea4b55f
2 changes: 1 addition & 1 deletion trunk/net/batman-adv/hard-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,

/* nobody uses this interface anymore */
if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO)
batadv_softif_destroy(hard_iface->soft_iface);
batadv_softif_destroy_sysfs(hard_iface->soft_iface);

hard_iface->soft_iface = NULL;
batadv_hardif_free_ref(hard_iface);
Expand Down
6 changes: 5 additions & 1 deletion trunk/net/batman-adv/soft-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,11 @@ struct net_device *batadv_softif_create(const char *name)
return soft_iface;
}

void batadv_softif_destroy(struct net_device *soft_iface)
/**
* batadv_softif_destroy_sysfs - deletion of batadv_soft_interface via sysfs
* @soft_iface: the to-be-removed batman-adv interface
*/
void batadv_softif_destroy_sysfs(struct net_device *soft_iface)
{
struct batadv_priv *bat_priv = netdev_priv(soft_iface);

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/batman-adv/soft-interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
struct sk_buff *skb, struct batadv_hard_iface *recv_if,
int hdr_size, struct batadv_orig_node *orig_node);
struct net_device *batadv_softif_create(const char *name);
void batadv_softif_destroy(struct net_device *soft_iface);
void batadv_softif_destroy_sysfs(struct net_device *soft_iface);
int batadv_softif_is_valid(const struct net_device *net_dev);

#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */

0 comments on commit 2a58f50

Please sign in to comment.