Skip to content

Commit

Permalink
ipvs: Initialize mcast addr at compile time
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sven Wegener committed Jul 16, 2008
1 parent 0b57664 commit d564005
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions net/ipv4/ipvs/ip_vs_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit d564005

Please sign in to comment.