Commit 237c609f authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nfnetlink: add and use nfnetlink_broadcast 



This removes the only reference of net->nfnl outside of the nfnetlink
module.  This allows to move net->nfnl to net_generic infra.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8c56049f

include/linux/netfilter/nfnetlink.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 portid, 
		   unsigned int group, int echo, gfp_t flags);

int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error);

int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u32 portid);

void nfnetlink_broadcast(struct net *net, struct sk_buff *skb, __u32 portid,

			 __u32 group, gfp_t allocation);



static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type)

{

net/netfilter/nfnetlink.c

+7 −0
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u32 portid) 
}

EXPORT_SYMBOL_GPL(nfnetlink_unicast);



void nfnetlink_broadcast(struct net *net, struct sk_buff *skb, __u32 portid,

			 __u32 group, gfp_t allocation)

{

	netlink_broadcast(net->nfnl, skb, portid, group, allocation);

}

EXPORT_SYMBOL_GPL(nfnetlink_broadcast);



/* Process one complete nfnetlink message. */

static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,

			     struct netlink_ext_ack *extack)

net/netfilter/nfnetlink_acct.c

+1 −2
Original line number Diff line number Diff line
@@ -469,8 +469,7 @@ static void nfnl_overquota_report(struct net *net, struct nf_acct *nfacct) 
		kfree_skb(skb);

		return;

	}

	netlink_broadcast(net->nfnl, skb, 0, NFNLGRP_ACCT_QUOTA,

			  GFP_ATOMIC);

	nfnetlink_broadcast(net, skb, 0, NFNLGRP_ACCT_QUOTA, GFP_ATOMIC);

}



int nfnl_acct_overquota(struct net *net, struct nf_acct *nfacct)