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>

diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c
index 6b8ec28cda8973564186c9aabfa3ab3dc820c498..a58a89a7aa0e620536cb0c71acc896880c2c80b9 100644 (file)
--- a/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
@@ -158,7 +158,7 @@ static void check_known_mac_addr(uint8_t *addr)
                        continue;
 
                pr_warning("The newly added mac address (%pM) already exists "
-                          "on: %s\n", addr, batman_if->dev);
+                          "on: %s\n", addr, batman_if->net_dev->name);
                pr_warning("It is strongly recommended to keep mac addresses "
                           "unique to avoid problems!\n");
        }
@@ -223,7 +223,7 @@ static void hardif_activate_interface(struct batman_if *batman_if)
                set_primary_if(bat_priv, batman_if);
 
        bat_info(batman_if->soft_iface, "Interface activated: %s\n",
-                batman_if->dev);
+                batman_if->net_dev->name);
 
        update_min_mtu(batman_if->soft_iface);
        return;
@@ -238,7 +238,7 @@ static void hardif_deactivate_interface(struct batman_if *batman_if)
        batman_if->if_status = IF_INACTIVE;
 
        bat_info(batman_if->soft_iface, "Interface deactivated: %s\n",
-                batman_if->dev);
+                batman_if->net_dev->name);
 
        update_min_mtu(batman_if->soft_iface);
 }
@@ -269,7 +269,7 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
 
        if (!batman_if->packet_buff) {
                bat_err(batman_if->soft_iface, "Can't add interface packet "
-                       "(%s): out of memory\n", batman_if->dev);
+                       "(%s): out of memory\n", batman_if->net_dev->name);
                goto err;
        }
 
@@ -294,7 +294,7 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
        atomic_set(&batman_if->seqno, 1);
        atomic_set(&batman_if->frag_seqno, 1);
        bat_info(batman_if->soft_iface, "Adding interface: %s\n",
-                batman_if->dev);
+                batman_if->net_dev->name);
 
        if (atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
                ETH_DATA_LEN + BAT_HEADER_LEN)
@@ -304,7 +304,7 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
                        "over this interface will be fragmented on layer2 "
                        "which could impact the performance. Setting the MTU "
                        "to %zi would solve the problem.\n",
-                       batman_if->dev, batman_if->net_dev->mtu,
+                       batman_if->net_dev->name, batman_if->net_dev->mtu,
                        ETH_DATA_LEN + BAT_HEADER_LEN);
 
        if (!atomic_read(&bat_priv->frag_enabled) && batman_if->net_dev->mtu <
@@ -314,7 +314,7 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
                        "the transport of batman-adv packets. If you experience"
                        " problems getting traffic through try increasing the "
                        "MTU to %zi.\n",
-                       batman_if->dev, batman_if->net_dev->mtu,
+                       batman_if->net_dev->name, batman_if->net_dev->mtu,
                        ETH_DATA_LEN + BAT_HEADER_LEN);
 
        if (hardif_is_iface_up(batman_if))
@@ -322,7 +322,7 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
        else
                bat_err(batman_if->soft_iface, "Not using interface %s "
                        "(retrying later): interface not active\n",
-                       batman_if->dev);
+                       batman_if->net_dev->name);
 
        /* begin scheduling originator messages on that interface */
        schedule_own_packet(batman_if);
@@ -345,7 +345,7 @@ void hardif_disable_interface(struct batman_if *batman_if)
                return;
 
        bat_info(batman_if->soft_iface, "Removing interface: %s\n",
-                batman_if->dev);
+                batman_if->net_dev->name);
        dev_remove_pack(&batman_if->batman_adv_ptype);
 
        bat_priv->num_ifaces--;
@@ -389,13 +389,9 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev)
                goto release_dev;
        }
 
-       batman_if->dev = kstrdup(net_dev->name, GFP_ATOMIC);
-       if (!batman_if->dev)
-               goto free_if;
-
        ret = sysfs_add_hardif(&batman_if->hardif_obj, net_dev);
        if (ret)
-               goto free_dev;
+               goto free_if;
 
        batman_if->if_num = -1;
        batman_if->net_dev = net_dev;
@@ -407,8 +403,6 @@ static struct batman_if *hardif_add_interface(struct net_device *net_dev)
        list_add_tail_rcu(&batman_if->list, &if_list);
        return batman_if;
 
-free_dev:
-       kfree(batman_if->dev);
 free_if:
        kfree(batman_if);
 release_dev:
@@ -421,7 +415,6 @@ static void hardif_free_interface(struct rcu_head *rcu)
 {
        struct batman_if *batman_if = container_of(rcu, struct batman_if, rcu);
 
-       kfree(batman_if->dev);
        kfree(batman_if);
 }
 
@@ -476,8 +469,6 @@ static int hard_if_event(struct notifier_block *this,
        case NETDEV_UNREGISTER:
                hardif_remove_interface(batman_if);
                break;
-       case NETDEV_CHANGENAME:
-               break;
        case NETDEV_CHANGEADDR:
                if (batman_if->if_status == IF_NOT_IN_USE)
                        goto out;

diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c
index d20721b577067f9cf9c2c2c5934abb102e4fc62e..f25d7fdfe8111384e971e4d9183cb004f7713a57 100644 (file)
--- 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);

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index 34cc321e2466de4f0edda3fefe0b6e1e1b2826b9..eda08b5efb0282144284ede0cc0b0addea4935a2 100644 (file)
--- a/drivers/staging/batman-adv/routing.c
+++ b/drivers/staging/batman-adv/routing.c
@@ -557,10 +557,11 @@ void receive_bat_packet(struct ethhdr *ethhdr,
                "Received BATMAN packet via NB: %pM, IF: %s [%s] "
                "(from OG: %pM, via prev OG: %pM, seqno %d, tq %d, "
                "TTL %d, V %d, IDF %d)\n",
-               ethhdr->h_source, if_incoming->dev, if_incoming->addr_str,
-               batman_packet->orig, batman_packet->prev_sender,
-               batman_packet->seqno, batman_packet->tq, batman_packet->ttl,
-               batman_packet->version, has_directlink_flag);
+               ethhdr->h_source, if_incoming->net_dev->name,
+               if_incoming->addr_str, batman_packet->orig,
+               batman_packet->prev_sender, batman_packet->seqno,
+               batman_packet->tq, batman_packet->ttl, batman_packet->version,
+               has_directlink_flag);
 
        list_for_each_entry_rcu(batman_if, &if_list, list) {
                if (batman_if->if_status != IF_ACTIVE)

diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c
index e9980efa19b4cb6c5ad535a79776a4763df54bf3..5d57ef5120b064c45a37cd6fb63f1c2663587373 100644 (file)
--- a/drivers/staging/batman-adv/send.c
+++ b/drivers/staging/batman-adv/send.c
@@ -68,7 +68,7 @@ int send_skb_packet(struct sk_buff *skb,
 
        if (!(batman_if->net_dev->flags & IFF_UP)) {
                pr_warning("Interface %s is not up - can't send packet via "
-                          "that interface!\n", batman_if->dev);
+                          "that interface!\n", batman_if->net_dev->name);
                goto send_skb_err;
        }
 
@@ -141,7 +141,7 @@ static void send_packet_to_if(struct forw_packet *forw_packet,
                        batman_packet->tq, batman_packet->ttl,
                        (batman_packet->flags & DIRECTLINK ?
                         "on" : "off"),
-                       batman_if->dev, batman_if->addr_str);
+                       batman_if->net_dev->name, batman_if->addr_str);
 
                buff_pos += sizeof(struct batman_packet) +
                        (batman_packet->num_hna * ETH_ALEN);
@@ -186,7 +186,8 @@ static void send_packet(struct forw_packet *forw_packet)
                        "on interface %s [%s]\n",
                        (forw_packet->own ? "Sending own" : "Forwarding"),
                        batman_packet->orig, ntohl(batman_packet->seqno),
-                       batman_packet->ttl, forw_packet->if_incoming->dev,
+                       batman_packet->ttl,
+                       forw_packet->if_incoming->net_dev->name,
                        forw_packet->if_incoming->addr_str);
 
                /* skb is only used once and than forw_packet is free'd */
@@ -521,7 +522,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv,
        if (batman_if)
                bat_dbg(DBG_BATMAN, bat_priv,
                        "purge_outstanding_packets(): %s\n",
-                       batman_if->dev);
+                       batman_if->net_dev->name);
        else
                bat_dbg(DBG_BATMAN, bat_priv,
                        "purge_outstanding_packets()\n");

diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
index b4f2b0cdb729c4845ddeef760f4492f3f9a89f5d..e779c4a0f2145e1bd968dd09a05a979db9695ded 100644 (file)
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/types.h
@@ -36,7 +36,6 @@
 struct batman_if {
        struct list_head list;
        int16_t if_num;
-       char *dev;
        char if_status;
        char addr_str[ETH_STR_LEN];
        struct net_device *net_dev;