Commit 0b0f43fe authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

net sched: indentation and other OCD stylistic fixes 



Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
parent be119913

include/net/act_api.h

+8 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define __NET_ACT_API_H



/*

 * Public police action API for classifiers/qdiscs

 * Public action API for classifiers/qdiscs

*/



#include <net/sch_generic.h>
@@ -107,7 +107,8 @@ struct tc_action_ops { 
	char    kind[IFNAMSIZ];

	__u32   type; /* TBD to match kind */

	struct module		*owner;

	int     (*act)(struct sk_buff *, const struct tc_action *, struct tcf_result *);

	int     (*act)(struct sk_buff *, const struct tc_action *,

		       struct tcf_result *);

	int     (*dump)(struct sk_buff *, struct tc_action *, int, int);

	void	(*cleanup)(struct tc_action *, int bind);

	int     (*lookup)(struct net *, struct tc_action *, u32);
@@ -125,8 +126,8 @@ struct tc_action_net { 
};



static inline

int tc_action_net_init(struct tc_action_net *tn, const struct tc_action_ops *ops,

		       unsigned int mask)

int tc_action_net_init(struct tc_action_net *tn,

		       const struct tc_action_ops *ops, unsigned int mask)

{

	int err = 0;
@@ -169,7 +170,8 @@ static inline int tcf_hash_release(struct tc_action *a, bool bind) 
}



int tcf_register_action(struct tc_action_ops *a, struct pernet_operations *ops);

int tcf_unregister_action(struct tc_action_ops *a, struct pernet_operations *ops);

int tcf_unregister_action(struct tc_action_ops *a,

			  struct pernet_operations *ops);

int tcf_action_destroy(struct list_head *actions, int bind);

int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions,

		    struct tcf_result *res);

net/sched/act_api.c

+11 −8
Original line number Diff line number Diff line
@@ -504,8 +504,8 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) 
}

EXPORT_SYMBOL(tcf_action_dump_1);



int

tcf_action_dump(struct sk_buff *skb, struct list_head *actions, int bind, int ref)

int tcf_action_dump(struct sk_buff *skb, struct list_head *actions,

		    int bind, int ref)

{

	struct tc_action *a;

	int err = -EINVAL;
@@ -688,9 +688,9 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a, 
	return -1;

}



static int

tca_get_fill(struct sk_buff *skb, struct list_head *actions, u32 portid, u32 seq,

	     u16 flags, int event, int bind, int ref)

static int tca_get_fill(struct sk_buff *skb, struct list_head *actions,

			u32 portid, u32 seq, u16 flags, int event, int bind,

			int ref)

{

	struct tcamsg *t;

	struct nlmsghdr *nlh;
@@ -731,7 +731,8 @@ act_get_notify(struct net *net, u32 portid, struct nlmsghdr *n, 
	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);

	if (!skb)

		return -ENOBUFS;

	if (tca_get_fill(skb, actions, portid, n->nlmsg_seq, 0, event, 0, 0) <= 0) {

	if (tca_get_fill(skb, actions, portid, n->nlmsg_seq, 0, event,

			 0, 0) <= 0) {

		kfree_skb(skb);

		return -EINVAL;

	}
@@ -839,7 +840,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, 
	if (a.ops == NULL) /*some idjot trying to flush unknown action */

		goto err_out;



	nlh = nlmsg_put(skb, portid, n->nlmsg_seq, RTM_DELACTION, sizeof(*t), 0);

	nlh = nlmsg_put(skb, portid, n->nlmsg_seq, RTM_DELACTION,

			sizeof(*t), 0);

	if (!nlh)

		goto out_module_put;

	t = nlmsg_data(nlh);
@@ -1002,7 +1004,8 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n) 
	u32 portid = skb ? NETLINK_CB(skb).portid : 0;

	int ret = 0, ovr = 0;



	if ((n->nlmsg_type != RTM_GETACTION) && !netlink_capable(skb, CAP_NET_ADMIN))

	if ((n->nlmsg_type != RTM_GETACTION) &&

	    !netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	ret = nlmsg_parse(n, sizeof(struct tcamsg), tca, TCA_ACT_MAX, NULL);

net/sched/act_bpf.c

+2 −1
Original line number Diff line number Diff line
@@ -169,7 +169,8 @@ static int tcf_bpf_dump(struct sk_buff *skb, struct tc_action *act, 
static const struct nla_policy act_bpf_policy[TCA_ACT_BPF_MAX + 1] = {

	[TCA_ACT_BPF_PARMS]	= { .len = sizeof(struct tc_act_bpf) },

	[TCA_ACT_BPF_FD]	= { .type = NLA_U32 },

	[TCA_ACT_BPF_NAME]	= { .type = NLA_NUL_STRING, .len = ACT_BPF_NAME_LEN },

	[TCA_ACT_BPF_NAME]	= { .type = NLA_NUL_STRING,

				    .len = ACT_BPF_NAME_LEN },

	[TCA_ACT_BPF_OPS_LEN]	= { .type = NLA_U16 },

	[TCA_ACT_BPF_OPS]	= { .type = NLA_BINARY,

				    .len = sizeof(struct sock_filter) * BPF_MAXINSNS },

net/sched/act_gact.c

+2 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets, 
	tm->lastuse = lastuse;

}



static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref)

static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a,

			 int bind, int ref)

{

	unsigned char *b = skb_tail_pointer(skb);

	struct tcf_gact *gact = a->priv;

net/sched/act_ipt.c

+4 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ static int ipt_net_id; 


static int xt_net_id;



static int ipt_init_target(struct xt_entry_target *t, char *table, unsigned int hook)

static int ipt_init_target(struct xt_entry_target *t, char *table,

			   unsigned int hook)

{

	struct xt_tgchk_param par;

	struct xt_target *target;
@@ -250,7 +251,8 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a, 


}



static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref)

static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind,

			int ref)

{

	unsigned char *b = skb_tail_pointer(skb);

	struct tcf_ipt *ipt = a->priv;