提交 0b0f43fe 编写于 作者: J Jamal Hadi Salim 提交者: David S. Miller

net sched: indentation and other OCD stylistic fixes

Signed-off-by: NJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: NCong Wang <xiyou.wangcong@gmail.com>
上级 be119913
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#define __NET_ACT_API_H #define __NET_ACT_API_H
/* /*
* Public police action API for classifiers/qdiscs * Public action API for classifiers/qdiscs
*/ */
#include <net/sch_generic.h> #include <net/sch_generic.h>
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
...@@ -107,7 +107,8 @@ struct tc_action_ops { ...@@ -107,7 +107,8 @@ struct tc_action_ops {
char kind[IFNAMSIZ]; char kind[IFNAMSIZ];
__u32 type; /* TBD to match kind */ __u32 type; /* TBD to match kind */
struct module *owner; 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); int (*dump)(struct sk_buff *, struct tc_action *, int, int);
void (*cleanup)(struct tc_action *, int bind); void (*cleanup)(struct tc_action *, int bind);
int (*lookup)(struct net *, struct tc_action *, u32); int (*lookup)(struct net *, struct tc_action *, u32);
...@@ -125,8 +126,8 @@ struct tc_action_net { ...@@ -125,8 +126,8 @@ struct tc_action_net {
}; };
static inline static inline
int tc_action_net_init(struct tc_action_net *tn, const struct tc_action_ops *ops, int tc_action_net_init(struct tc_action_net *tn,
unsigned int mask) const struct tc_action_ops *ops, unsigned int mask)
{ {
int err = 0; int err = 0;
...@@ -169,7 +170,8 @@ static inline int tcf_hash_release(struct tc_action *a, bool bind) ...@@ -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_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_destroy(struct list_head *actions, int bind);
int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions, int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions,
struct tcf_result *res); struct tcf_result *res);
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
struct tcf_defact { struct tcf_defact {
struct tcf_common common; struct tcf_common common;
u32 tcfd_datalen; u32 tcfd_datalen;
void *tcfd_defdata; void *tcfd_defdata;
}; };
#define to_defact(a) \ #define to_defact(a) \
container_of(a->priv, struct tcf_defact, common) container_of(a->priv, struct tcf_defact, common)
......
...@@ -115,8 +115,8 @@ struct tc_police { ...@@ -115,8 +115,8 @@ struct tc_police {
__u32 mtu; __u32 mtu;
struct tc_ratespec rate; struct tc_ratespec rate;
struct tc_ratespec peakrate; struct tc_ratespec peakrate;
int refcnt; int refcnt;
int bindcnt; int bindcnt;
__u32 capab; __u32 capab;
}; };
...@@ -128,7 +128,7 @@ struct tcf_t { ...@@ -128,7 +128,7 @@ struct tcf_t {
}; };
struct tc_cnt { struct tc_cnt {
int refcnt; int refcnt;
int bindcnt; int bindcnt;
}; };
......
...@@ -504,8 +504,8 @@ tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int bind, int ref) ...@@ -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); EXPORT_SYMBOL(tcf_action_dump_1);
int int tcf_action_dump(struct sk_buff *skb, struct list_head *actions,
tcf_action_dump(struct sk_buff *skb, struct list_head *actions, int bind, int ref) int bind, int ref)
{ {
struct tc_action *a; struct tc_action *a;
int err = -EINVAL; int err = -EINVAL;
...@@ -688,9 +688,9 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a, ...@@ -688,9 +688,9 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
return -1; return -1;
} }
static int static int tca_get_fill(struct sk_buff *skb, struct list_head *actions,
tca_get_fill(struct sk_buff *skb, struct list_head *actions, u32 portid, u32 seq, u32 portid, u32 seq, u16 flags, int event, int bind,
u16 flags, int event, int bind, int ref) int ref)
{ {
struct tcamsg *t; struct tcamsg *t;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
...@@ -731,7 +731,8 @@ act_get_notify(struct net *net, u32 portid, struct nlmsghdr *n, ...@@ -731,7 +731,8 @@ act_get_notify(struct net *net, u32 portid, struct nlmsghdr *n,
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL); skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
if (!skb) if (!skb)
return -ENOBUFS; 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); kfree_skb(skb);
return -EINVAL; return -EINVAL;
} }
...@@ -839,7 +840,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, ...@@ -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 */ if (a.ops == NULL) /*some idjot trying to flush unknown action */
goto err_out; 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) if (!nlh)
goto out_module_put; goto out_module_put;
t = nlmsg_data(nlh); t = nlmsg_data(nlh);
...@@ -1002,7 +1004,8 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n) ...@@ -1002,7 +1004,8 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n)
u32 portid = skb ? NETLINK_CB(skb).portid : 0; u32 portid = skb ? NETLINK_CB(skb).portid : 0;
int ret = 0, ovr = 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; return -EPERM;
ret = nlmsg_parse(n, sizeof(struct tcamsg), tca, TCA_ACT_MAX, NULL); ret = nlmsg_parse(n, sizeof(struct tcamsg), tca, TCA_ACT_MAX, NULL);
......
...@@ -169,7 +169,8 @@ static int tcf_bpf_dump(struct sk_buff *skb, struct tc_action *act, ...@@ -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] = { 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_PARMS] = { .len = sizeof(struct tc_act_bpf) },
[TCA_ACT_BPF_FD] = { .type = NLA_U32 }, [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_LEN] = { .type = NLA_U16 },
[TCA_ACT_BPF_OPS] = { .type = NLA_BINARY, [TCA_ACT_BPF_OPS] = { .type = NLA_BINARY,
.len = sizeof(struct sock_filter) * BPF_MAXINSNS }, .len = sizeof(struct sock_filter) * BPF_MAXINSNS },
......
...@@ -162,7 +162,8 @@ static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets, ...@@ -162,7 +162,8 @@ static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets,
tm->lastuse = lastuse; 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); unsigned char *b = skb_tail_pointer(skb);
struct tcf_gact *gact = a->priv; struct tcf_gact *gact = a->priv;
......
...@@ -34,7 +34,8 @@ static int ipt_net_id; ...@@ -34,7 +34,8 @@ static int ipt_net_id;
static int xt_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_tgchk_param par;
struct xt_target *target; struct xt_target *target;
...@@ -250,7 +251,8 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a, ...@@ -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); unsigned char *b = skb_tail_pointer(skb);
struct tcf_ipt *ipt = a->priv; struct tcf_ipt *ipt = a->priv;
......
...@@ -179,7 +179,8 @@ static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a, ...@@ -179,7 +179,8 @@ static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a,
if (v->tcfv_action == TCA_VLAN_ACT_PUSH && if (v->tcfv_action == TCA_VLAN_ACT_PUSH &&
(nla_put_u16(skb, TCA_VLAN_PUSH_VLAN_ID, v->tcfv_push_vid) || (nla_put_u16(skb, TCA_VLAN_PUSH_VLAN_ID, v->tcfv_push_vid) ||
nla_put_be16(skb, TCA_VLAN_PUSH_VLAN_PROTOCOL, v->tcfv_push_proto))) nla_put_be16(skb, TCA_VLAN_PUSH_VLAN_PROTOCOL,
v->tcfv_push_proto)))
goto nla_put_failure; goto nla_put_failure;
tcf_tm_dump(&t, &v->tcf_tm); tcf_tm_dump(&t, &v->tcf_tm);
......
...@@ -351,8 +351,9 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) ...@@ -351,8 +351,9 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n)
return err; return err;
} }
static int tcf_fill_node(struct net *net, struct sk_buff *skb, struct tcf_proto *tp, static int tcf_fill_node(struct net *net, struct sk_buff *skb,
unsigned long fh, u32 portid, u32 seq, u16 flags, int event) struct tcf_proto *tp, unsigned long fh, u32 portid,
u32 seq, u16 flags, int event)
{ {
struct tcmsg *tcm; struct tcmsg *tcm;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
...@@ -474,9 +475,11 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -474,9 +475,11 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
TC_H_MIN(tcm->tcm_info) != tp->protocol) TC_H_MIN(tcm->tcm_info) != tp->protocol)
continue; continue;
if (t > s_t) if (t > s_t)
memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0])); memset(&cb->args[1], 0,
sizeof(cb->args)-sizeof(cb->args[0]));
if (cb->args[1] == 0) { if (cb->args[1] == 0) {
if (tcf_fill_node(net, 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, cb->nlh->nlmsg_seq, NLM_F_MULTI,
RTM_NEWTFILTER) <= 0) RTM_NEWTFILTER) <= 0)
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册