diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-18 01:38:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-18 01:38:03 +0200 |
| commit | ae2a4583154a5b985ed4a81c6259c55bafe6d810 (patch) | |
| tree | fcfcecfb03924eb1f4368c4aaee83d7d36bf6df0 /include | |
| parent | x25: Prevent skb overreads when checking call user data (diff) | |
| parent | IPVS netns shutdown/startup dead-lock (diff) | |
| download | linux-ae2a4583154a5b985ed4a81c6259c55bafe6d810.tar.xz linux-ae2a4583154a5b985ed4a81c6259c55bafe6d810.zip | |
Merge branch 'nf' of git://1984.lsi.us.es/net
Diffstat (limited to 'include')
| -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 1aaf915656f3..8fa4430f99c1 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]; |