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

net sched: stylistic cleanups 



Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f71b109f

net/sched/act_api.c

+6 −10
Original line number Diff line number Diff line
@@ -592,9 +592,8 @@ struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla, 
	return ERR_PTR(err);

}



int tcf_action_init(struct net *net, struct nlattr *nla,

				  struct nlattr *est, char *name, int ovr,

				  int bind, struct list_head *actions)

int tcf_action_init(struct net *net, struct nlattr *nla, struct nlattr *est,

		    char *name, int ovr, int bind, struct list_head *actions)

{

	struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];

	struct tc_action *act;
@@ -923,9 +922,8 @@ tcf_add_notify(struct net *net, struct nlmsghdr *n, struct list_head *actions, 
	return err;

}



static int

tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n,

	       u32 portid, int ovr)

static int tcf_action_add(struct net *net, struct nlattr *nla,

			  struct nlmsghdr *n, u32 portid, int ovr)

{

	int ret = 0;

	LIST_HEAD(actions);
@@ -988,8 +986,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n) 
	return ret;

}



static struct nlattr *

find_dump_kind(const struct nlmsghdr *n)

static struct nlattr *find_dump_kind(const struct nlmsghdr *n)

{

	struct nlattr *tb1, *tb2[TCA_ACT_MAX + 1];

	struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];
@@ -1016,8 +1013,7 @@ find_dump_kind(const struct nlmsghdr *n) 
	return kind;

}



static int

tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)

static int tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)

{

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

	struct nlmsghdr *nlh;

net/sched/act_csum.c

+18 −18
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ static void *tcf_csum_skb_nextlayer(struct sk_buff *skb, 
		return (void *)(skb_network_header(skb) + ihl);

}



static int tcf_csum_ipv4_icmp(struct sk_buff *skb,

			      unsigned int ihl, unsigned int ipl)

static int tcf_csum_ipv4_icmp(struct sk_buff *skb, unsigned int ihl,

			      unsigned int ipl)

{

	struct icmphdr *icmph;
@@ -152,8 +152,8 @@ static int tcf_csum_ipv4_igmp(struct sk_buff *skb, 
	return 1;

}



static int tcf_csum_ipv6_icmp(struct sk_buff *skb,

			      unsigned int ihl, unsigned int ipl)

static int tcf_csum_ipv6_icmp(struct sk_buff *skb, unsigned int ihl,

			      unsigned int ipl)

{

	struct icmp6hdr *icmp6h;

	const struct ipv6hdr *ip6h;
@@ -174,8 +174,8 @@ static int tcf_csum_ipv6_icmp(struct sk_buff *skb, 
	return 1;

}



static int tcf_csum_ipv4_tcp(struct sk_buff *skb,

			     unsigned int ihl, unsigned int ipl)

static int tcf_csum_ipv4_tcp(struct sk_buff *skb, unsigned int ihl,

			     unsigned int ipl)

{

	struct tcphdr *tcph;

	const struct iphdr *iph;
@@ -195,8 +195,8 @@ static int tcf_csum_ipv4_tcp(struct sk_buff *skb, 
	return 1;

}



static int tcf_csum_ipv6_tcp(struct sk_buff *skb,

			     unsigned int ihl, unsigned int ipl)

static int tcf_csum_ipv6_tcp(struct sk_buff *skb, unsigned int ihl,

			     unsigned int ipl)

{

	struct tcphdr *tcph;

	const struct ipv6hdr *ip6h;
@@ -217,8 +217,8 @@ static int tcf_csum_ipv6_tcp(struct sk_buff *skb, 
	return 1;

}



static int tcf_csum_ipv4_udp(struct sk_buff *skb,

			     unsigned int ihl, unsigned int ipl, int udplite)

static int tcf_csum_ipv4_udp(struct sk_buff *skb, unsigned int ihl,

			     unsigned int ipl, int udplite)

{

	struct udphdr *udph;

	const struct iphdr *iph;
@@ -270,8 +270,8 @@ static int tcf_csum_ipv4_udp(struct sk_buff *skb, 
	return 1;

}



static int tcf_csum_ipv6_udp(struct sk_buff *skb,

			     unsigned int ihl, unsigned int ipl, int udplite)

static int tcf_csum_ipv6_udp(struct sk_buff *skb, unsigned int ihl,

			     unsigned int ipl, int udplite)

{

	struct udphdr *udph;

	const struct ipv6hdr *ip6h;
@@ -380,8 +380,8 @@ static int tcf_csum_ipv4(struct sk_buff *skb, u32 update_flags) 
	return 0;

}



static int tcf_csum_ipv6_hopopts(struct ipv6_opt_hdr *ip6xh,

				 unsigned int ixhl, unsigned int *pl)

static int tcf_csum_ipv6_hopopts(struct ipv6_opt_hdr *ip6xh, unsigned int ixhl,

				 unsigned int *pl)

{

	int off, len, optlen;

	unsigned char *xh = (void *)ip6xh;
@@ -494,8 +494,8 @@ static int tcf_csum_ipv6(struct sk_buff *skb, u32 update_flags) 
	return 0;

}



static int tcf_csum(struct sk_buff *skb,

		    const struct tc_action *a, struct tcf_result *res)

static int tcf_csum(struct sk_buff *skb, const struct tc_action *a,

		    struct tcf_result *res)

{

	struct tcf_csum *p = to_tcf_csum(a);

	int action;
@@ -531,8 +531,8 @@ static int tcf_csum(struct sk_buff *skb, 
	return TC_ACT_SHOT;

}



static int tcf_csum_dump(struct sk_buff *skb,

			 struct tc_action *a, int bind, int ref)

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

			 int ref)

{

	unsigned char *b = skb_tail_pointer(skb);

	struct tcf_csum *p = to_tcf_csum(a);

net/sched/act_gact.c

+2 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets, 
	int action = READ_ONCE(gact->tcf_action);

	struct tcf_t *tm = &gact->tcf_tm;



	_bstats_cpu_update(this_cpu_ptr(gact->common.cpu_bstats), bytes, packets);

	_bstats_cpu_update(this_cpu_ptr(gact->common.cpu_bstats), bytes,

			   packets);

	if (action == TC_ACT_SHOT)

		this_cpu_ptr(gact->common.cpu_qstats)->drops += packets;

net/sched/act_mirred.c

+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a, 
	return retval;

}



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

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

			   int ref)

{

	unsigned char *b = skb_tail_pointer(skb);

	struct tcf_mirred *m = to_mirred(a);

net/sched/act_police.c

+4 −6
Original line number Diff line number Diff line
@@ -263,8 +263,8 @@ static int tcf_act_police(struct sk_buff *skb, const struct tc_action *a, 
	return police->tcf_action;

}



static int

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

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

			       int bind, int ref)

{

	unsigned char *b = skb_tail_pointer(skb);

	struct tcf_police *police = to_police(a);
@@ -349,14 +349,12 @@ static struct pernet_operations police_net_ops = { 
	.size = sizeof(struct tc_action_net),

};



static int __init

police_init_module(void)

static int __init police_init_module(void)

{

	return tcf_register_action(&act_police_ops, &police_net_ops);

}



static void __exit

police_cleanup_module(void)

static void __exit police_cleanup_module(void)

{

	tcf_unregister_action(&act_police_ops, &police_net_ops);

}