From: Sven Wegener Date: Wed, 16 Jul 2008 11:13:35 +0000 (+0000) Subject: ipvs: Initialize mcast addr at compile time X-Git-Tag: v2.6.27-rc1~969^2~109^2~4 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d56400504a40a4aa197af629300d76544169e821;p=linux-2.6 ipvs: Initialize mcast addr at compile time There's no need to do it at runtime, the values are constant. Signed-off-by: Sven Wegener Acked-by: Simon Horman --- diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index 2d4a86f733..8c900dfe83 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c @@ -139,7 +139,11 @@ char ip_vs_master_mcast_ifn[IP_VS_IFNAME_MAXLEN]; char ip_vs_backup_mcast_ifn[IP_VS_IFNAME_MAXLEN]; /* multicast addr */ -static struct sockaddr_in mcast_addr; +static struct sockaddr_in mcast_addr = { + .sin_family = AF_INET, + .sin_port = __constant_htons(IP_VS_SYNC_PORT), + .sin_addr.s_addr = __constant_htonl(IP_VS_SYNC_GROUP), +}; static inline void sb_queue_tail(struct ip_vs_sync_buff *sb) @@ -862,11 +866,6 @@ static int sync_thread(void *startup) /* set the maximum length of sync message */ set_sync_mesg_maxlen(state); - /* set up multicast address */ - mcast_addr.sin_family = AF_INET; - mcast_addr.sin_port = htons(IP_VS_SYNC_PORT); - mcast_addr.sin_addr.s_addr = htonl(IP_VS_SYNC_GROUP); - add_wait_queue(&sync_wait, &wait); set_sync_pid(state, task_pid_nr(current));