[linux-next] LinuxNextTracking branch, master, updated. next-20120313

batman at open-mesh.org batman at open-mesh.org
Wed Mar 14 00:18:41 CET 2012


The following commit has been merged in the master branch:
commit e8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258
Merge: bb092c0db883d435d9d774e10b4cf71f12aad122 40e0c4f51d3fc3fd54edc797adae314fbe2b96a6
Author: David S. Miller <davem at davemloft.net>
Date:   Sun Mar 11 15:36:34 2012 -0700

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

diff --combined net/batman-adv/soft-interface.c
index 8fb16d2,3ba057d..a5590f4
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -252,8 -252,8 +252,8 @@@ static void softif_neigh_vid_select(str
  			vid, curr_neigh->addr);
  	else if ((curr_neigh) && (new_neigh))
  		bat_dbg(DBG_ROUTES, bat_priv,
- 			"Changing mesh exit point on vid: %d from %pM "
- 			"to %pM.\n", vid, curr_neigh->addr, new_neigh->addr);
+ 			"Changing mesh exit point on vid: %d from %pM to %pM.\n",
+ 			vid, curr_neigh->addr, new_neigh->addr);
  	else if ((!curr_neigh) && (new_neigh))
  		bat_dbg(DBG_ROUTES, bat_priv,
  			"Setting mesh exit point on vid: %d to %pM.\n",
@@@ -327,15 -327,15 +327,15 @@@ int softif_neigh_seq_print_text(struct 
  
  	primary_if = primary_if_get_selected(bat_priv);
  	if (!primary_if) {
- 		ret = seq_printf(seq, "BATMAN mesh %s disabled - "
- 				 "please specify interfaces to enable it\n",
+ 		ret = seq_printf(seq,
+ 				 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
  				 net_dev->name);
  		goto out;
  	}
  
  	if (primary_if->if_status != IF_ACTIVE) {
- 		ret = seq_printf(seq, "BATMAN mesh %s "
- 				 "disabled - primary interface not active\n",
+ 		ret = seq_printf(seq,
+ 				 "BATMAN mesh %s disabled - primary interface not active\n",
  				 net_dev->name);
  		goto out;
  	}
@@@ -403,8 -403,7 +403,7 @@@ void softif_neigh_purge(struct bat_pri
  
  			if (curr_softif_neigh == softif_neigh) {
  				bat_dbg(DBG_ROUTES, bat_priv,
- 					"Current mesh exit point on vid: %d "
- 					"'%pM' vanished.\n",
+ 					"Current mesh exit point on vid: %d '%pM' vanished.\n",
  					softif_neigh_vid->vid,
  					softif_neigh->addr);
  				do_deselect = 1;
@@@ -541,7 -540,6 +540,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 -782,7 +783,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 -799,8 +799,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);
  

-- 
LinuxNextTracking


More information about the linux-merge mailing list