Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 832d1d5b authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net_sched: add struct net pointer to tcf_proto_ops->dump 



It will be needed by the next patch.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a56e1953

include/net/sch_generic.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct tcf_proto_ops { 
	void			(*walk)(struct tcf_proto*, struct tcf_walker *arg);



	/* rtnetlink specific */

	int			(*dump)(struct tcf_proto*, unsigned long,

	int			(*dump)(struct net*, struct tcf_proto*, unsigned long,

					struct sk_buff *skb, struct tcmsg*);



	struct module		*owner;

net/sched/cls_api.c

+6 −5
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) 
	return err;

}



static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,

static int tcf_fill_node(struct net *net, struct sk_buff *skb, struct tcf_proto *tp,

			 unsigned long fh, u32 portid, u32 seq, u16 flags, int event)

{

	struct tcmsg *tcm;
@@ -362,7 +362,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, 
	tcm->tcm_handle = fh;

	if (RTM_DELTFILTER != event) {

		tcm->tcm_handle = 0;

		if (tp->ops->dump && tp->ops->dump(tp, fh, skb, tcm) < 0)

		if (tp->ops->dump && tp->ops->dump(net, tp, fh, skb, tcm) < 0)

			goto nla_put_failure;

	}

	nlh->nlmsg_len = skb_tail_pointer(skb) - b;
@@ -385,7 +385,7 @@ static int tfilter_notify(struct net *net, struct sk_buff *oskb, 
	if (!skb)

		return -ENOBUFS;



	if (tcf_fill_node(skb, tp, fh, portid, n->nlmsg_seq, 0, event) <= 0) {

	if (tcf_fill_node(net, skb, tp, fh, portid, n->nlmsg_seq, 0, event) <= 0) {

		kfree_skb(skb);

		return -EINVAL;

	}
@@ -404,8 +404,9 @@ static int tcf_node_dump(struct tcf_proto *tp, unsigned long n, 
			 struct tcf_walker *arg)

{

	struct tcf_dump_args *a = (void *)arg;

	struct net *net = sock_net(a->skb->sk);



	return tcf_fill_node(a->skb, tp, n, NETLINK_CB(a->cb->skb).portid,

	return tcf_fill_node(net, a->skb, tp, n, NETLINK_CB(a->cb->skb).portid,

			     a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER);

}
@@ -463,7 +464,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) 
		if (t > s_t)

			memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0]));

		if (cb->args[1] == 0) {

			if (tcf_fill_node(skb, tp, 0, NETLINK_CB(cb->skb).portid,

			if (tcf_fill_node(net, skb, tp, 0, NETLINK_CB(cb->skb).portid,

					  cb->nlh->nlmsg_seq, NLM_F_MULTI,

					  RTM_NEWTFILTER) <= 0)

				break;

net/sched/cls_basic.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static void basic_walk(struct tcf_proto *tp, struct tcf_walker *arg) 
	}

}



static int basic_dump(struct tcf_proto *tp, unsigned long fh,

static int basic_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,

		      struct sk_buff *skb, struct tcmsg *t)

{

	struct basic_filter *f = (struct basic_filter *) fh;

net/sched/cls_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int cls_bpf_change(struct net *net, struct sk_buff *in_skb, 
	return ret;

}



static int cls_bpf_dump(struct tcf_proto *tp, unsigned long fh,

static int cls_bpf_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,

			struct sk_buff *skb, struct tcmsg *tm)

{

	struct cls_bpf_prog *prog = (struct cls_bpf_prog *) fh;

net/sched/cls_cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void cls_cgroup_walk(struct tcf_proto *tp, struct tcf_walker *arg) 
	arg->count++;

}



static int cls_cgroup_dump(struct tcf_proto *tp, unsigned long fh,

static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,

			   struct sk_buff *skb, struct tcmsg *t)

{

	struct cls_cgroup_head *head = tp->root;