diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-05 21:21:11 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-05 21:21:11 (GMT) |
| commit | 9d9305949778c41b92d4394a2f2a6bcdb1c41a9c (patch) | |
| tree | d49d536ae8156ad9989dc7b26e3897f21e549b02 /net/netfilter/ipvs/ip_vs_ctl.c | |
| parent | 738faca34335cd1d5d87fa7c58703139c7fa15bd (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
| download | linux-9d9305949778c41b92d4394a2f2a6bcdb1c41a9c.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 33733c8..ae47090 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3120,7 +3120,7 @@ nla_put_failure: static int ip_vs_genl_dump_daemons(struct sk_buff *skb, struct netlink_callback *cb) { - struct net *net = skb_net(skb); + struct net *net = skb_sknet(skb); struct netns_ipvs *ipvs = net_ipvs(net); mutex_lock(&__ip_vs_mutex); |