From 0aa6d30c2db95c28c538f80a9d24638b5f14b4f8 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Fri, 28 Sep 2007 14:38:07 -0700 Subject: [PATCH] --- yaml --- r: 66814 b: refs/heads/master c: dd82185f2c55e9dc2247c83d78517ef14e71d30e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 2a49fc926862..f856be24ad82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdf708322d4658daa6eb795d1a835b97efdb335e +refs/heads/master: dd82185f2c55e9dc2247c83d78517ef14e71d30e diff --git a/trunk/net/netfilter/nfnetlink.c b/trunk/net/netfilter/nfnetlink.c index 3cfa76b89a20..e212102b0e4a 100644 --- a/trunk/net/netfilter/nfnetlink.c +++ b/trunk/net/netfilter/nfnetlink.c @@ -148,16 +148,7 @@ EXPORT_SYMBOL_GPL(nfnetlink_has_listeners); int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo) { - int err = 0; - - NETLINK_CB(skb).dst_group = group; - if (echo) - atomic_inc(&skb->users); - netlink_broadcast(nfnl, skb, pid, group, gfp_any()); - if (echo) - err = netlink_unicast(nfnl, skb, pid, MSG_DONTWAIT); - - return err; + return nlmsg_notify(nfnl, skb, pid, group, echo, gfp_any()); } EXPORT_SYMBOL_GPL(nfnetlink_send);