The following commit has been merged in the batman-adv/next branch: commit fa7f86f1bb5d8f08d10442a546252d2670b26f41 Author: Ying Xue ying.xue@windriver.com Date: Thu Aug 16 12:09:06 2012 +0000

tipc: optimize the initialization of network device notifier

Ethernet media initialization is only done when TIPC is started or switched to network mode. So the initialization of the network device notifier structure can be moved out of this function and done statically instead.

Signed-off-by: Ying Xue ying.xue@windriver.com Signed-off-by: Jon Maloy jon.maloy@ericsson.com Signed-off-by: Paul Gortmaker paul.gortmaker@windriver.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index 90ac9bf..0f312c2 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c @@ -58,7 +58,16 @@ struct eth_bearer { static struct tipc_media eth_media_info; static struct eth_bearer eth_bearers[MAX_ETH_BEARERS]; static int eth_started; -static struct notifier_block notifier; + +static int recv_notification(struct notifier_block *nb, unsigned long evt, + void *dv); +/* + * Network device notifier info + */ +static struct notifier_block notifier = { + .notifier_call = recv_notification, + .priority = 0 +};

/** * eth_media_addr_set - initialize Ethernet media address structure @@ -357,8 +366,6 @@ int tipc_eth_media_start(void) if (res) return res;

- notifier.notifier_call = &recv_notification; - notifier.priority = 0; res = register_netdevice_notifier(&notifier); if (!res) eth_started = 1;