diff options
author | David S. Miller <davem@davemloft.net> | 2011-10-17 19:38:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-17 19:38:03 -0400 |
commit | ae2a4583154a5b985ed4a81c6259c55bafe6d810 (patch) | |
tree | fcfcecfb03924eb1f4368c4aaee83d7d36bf6df0 /include/net | |
parent | 7f81e25befdfb3272345a2e775f520e1d515fa20 (diff) | |
parent | ae1d48b23d5e79efbcf0cef4f0ebb9742361af59 (diff) | |
download | op-kernel-dev-ae2a4583154a5b985ed4a81c6259c55bafe6d810.zip op-kernel-dev-ae2a4583154a5b985ed4a81c6259c55bafe6d810.tar.gz |
Merge branch 'nf' of git://1984.lsi.us.es/net
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ip_vs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 1aaf915..8fa4430 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -900,6 +900,7 @@ struct netns_ipvs { volatile int sync_state; volatile int master_syncid; volatile int backup_syncid; + struct mutex sync_mutex; /* multicast interface name */ char master_mcast_ifn[IP_VS_IFNAME_MAXLEN]; char backup_mcast_ifn[IP_VS_IFNAME_MAXLEN]; |