hlist: drop the node parameter from iterators

[cascardo/linux.git] / drivers / net / ethernet / sun / sunvnet.c

diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index e1b8955..1df0ff3 100644 (file)
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -614,10 +614,9 @@ struct vnet_port *__tx_port_find(struct vnet *vp, struct sk_buff *skb)
 {
        unsigned int hash = vnet_hashfn(skb->data);
        struct hlist_head *hp = &vp->port_hash[hash];
-       struct hlist_node *n;
        struct vnet_port *port;
 
-       hlist_for_each_entry(port, n, hp, hash) {
+       hlist_for_each_entry(port, hp, hash) {
                if (ether_addr_equal(port->raddr, skb->data))
                        return port;
        }
@@ -882,8 +881,8 @@ static int vnet_set_mac_addr(struct net_device *dev, void *p)
 static void vnet_get_drvinfo(struct net_device *dev,
                             struct ethtool_drvinfo *info)
 {
-       strcpy(info->driver, DRV_MODULE_NAME);
-       strcpy(info->version, DRV_MODULE_VERSION);
+       strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
+       strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
 }
 
 static u32 vnet_get_msglevel(struct net_device *dev)
@@ -1032,8 +1031,6 @@ static struct vnet *vnet_new(const u64 *local_mac)
        for (i = 0; i < ETH_ALEN; i++)
                dev->dev_addr[i] = (*local_mac >> (5 - i) * 8) & 0xff;
 
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
        vp = netdev_priv(dev);
 
        spin_lock_init(&vp->lock);