diff options
| author | Sven Eckelmann <sven.eckelmann@gmx.de> | 2010-09-05 01:58:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:29:50 -0700 |
| commit | 57b7117af84346c757be861c065ee790e4a62cb0 (patch) | |
| tree | 0ca9e58c9c2e132894c3e5c9ee5585daa2d4e6b0 /drivers/staging/batman-adv/originator.c | |
| parent | 8c70f13832ecaa0e4fc312d38990a25bc99e633b (diff) | |
| download | op-kernel-dev-57b7117af84346c757be861c065ee790e4a62cb0.zip op-kernel-dev-57b7117af84346c757be861c065ee790e4a62cb0.tar.gz | |
Staging: batman-adv: Remove duplicate of attached device name
batman_if has the name of the net_dev as extra string in its own
structure, but also holds a reference to the actual net_device structure
which always has the current name of the device. This makes it
unneccessary and also more complex because we must update the name in
situations when we receive a NETDEV_CHANGENAME event.
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/originator.c')
| -rw-r--r-- | drivers/staging/batman-adv/originator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c index d20721b..f25d7fd 100644 --- a/drivers/staging/batman-adv/originator.c +++ b/drivers/staging/batman-adv/originator.c @@ -214,7 +214,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, "neighbor purge: originator %pM, " "neighbor: %pM, iface: %s\n", orig_node->orig, neigh_node->addr, - neigh_node->if_incoming->dev); + neigh_node->if_incoming->net_dev->name); else bat_dbg(DBG_BATMAN, bat_priv, "neighbor timeout: originator %pM, " @@ -332,8 +332,8 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) rcu_read_lock(); seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)]\n", SOURCE_VERSION, REVISION_VERSION_STR, - bat_priv->primary_if->dev, bat_priv->primary_if->addr_str, - net_dev->name); + bat_priv->primary_if->net_dev->name, + bat_priv->primary_if->addr_str, net_dev->name); seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", "Potential nexthops"); @@ -361,7 +361,7 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, "%-17s %4i.%03is (%3i) %17s [%10s]:", orig_str, last_seen_secs, last_seen_msecs, orig_node->router->tq_avg, router_str, - orig_node->router->if_incoming->dev); + orig_node->router->if_incoming->net_dev->name); list_for_each_entry(neigh_node, &orig_node->neigh_list, list) { addr_to_string(orig_str, neigh_node->addr); |
