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/send.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/send.c')
| -rw-r--r-- | drivers/staging/batman-adv/send.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c index e9980ef..5d57ef5 100644 --- 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"); |
