]> err.no Git - linux-2.6/commitdiff
ipvs: Initialize mcast addr at compile time
authorSven Wegener <sven.wegener@stealer.net>
Wed, 16 Jul 2008 11:13:35 +0000 (11:13 +0000)
committerSven Wegener <sven.wegener@stealer.net>
Wed, 16 Jul 2008 22:33:19 +0000 (22:33 +0000)
There's no need to do it at runtime, the values are constant.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Acked-by: Simon Horman <horms@verge.net.au>
net/ipv4/ipvs/ip_vs_sync.c

index 2d4a86f73325bc7ae86f22384b6a018713e44102..8c900dfe832d7c587377c11da444d41ff74788a3 100644 (file)
@@ -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));