Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

diff --combined net/batman-adv/soft-interface.c
index 2d8bd2ad6ba384dd80be5a997821e05fe12e4a23,c39c120e1171b6260e102b210a6b56e78bb6a682..8fb16d209fd985a6b580d584123b1dd481ff66fe
--- 1/net/batman-adv/soft-interface.c
--- 2/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+  * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
   *
   * Marek Lindner, Simon Wunderlich
   *
@@@ -396,8 -396,8 +396,8 @@@ void softif_neigh_purge(struct bat_pri
                hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2,
                                          &softif_neigh_vid->softif_neigh_list,
                                          list) {
-                       if ((!time_after(jiffies, softif_neigh->last_seen +
-                               msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) &&
+                       if ((!has_timed_out(softif_neigh->last_seen,
+                                           SOFTIF_NEIGH_TIMEOUT)) &&
                            (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))
                                continue;
  
@@@ -541,7 -541,6 +541,7 @@@ static int interface_set_mac_addr(struc
        }
  
        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
 +      dev->addr_assign_type &= ~NET_ADDR_RANDOM;
        return 0;
  }
  
@@@ -784,6 -783,7 +784,6 @@@ static const struct net_device_ops bat_
  static void interface_setup(struct net_device *dev)
  {
        struct bat_priv *priv = netdev_priv(dev);
 -      char dev_addr[ETH_ALEN];
  
        ether_setup(dev);
  
@@@ -800,7 -800,8 +800,7 @@@
        dev->hard_header_len = BAT_HEADER_LEN;
  
        /* generate random address */
 -      random_ether_addr(dev_addr);
 -      memcpy(dev->dev_addr, dev_addr, ETH_ALEN);
 +      eth_hw_addr_random(dev);
  
        SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);