diff options
| author | Jamal Hadi Salim <jhs@mojatatu.com> | 2016-06-05 10:41:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-07 18:53:54 -0400 |
| commit | 0b0f43fe2e7291aa97b1febeaa5a0de453d007ca (patch) | |
| tree | c2f1c26ffbf8ec9d9b606a58b018622a023b2ae5 /include | |
| parent | be119913689724b6fe84caa779c2508547c4e8d5 (diff) | |
net sched: indentation and other OCD stylistic fixes
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/act_api.h | 14 | ||||
| -rw-r--r-- | include/net/tc_act/tc_defact.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/pkt_cls.h | 6 |
3 files changed, 13 insertions, 11 deletions
diff --git a/include/net/act_api.h b/include/net/act_api.h index a891978310e9..db218a12efb5 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | #define __NET_ACT_API_H | 2 | #define __NET_ACT_API_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * Public police action API for classifiers/qdiscs | 5 | * Public action API for classifiers/qdiscs |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <net/sch_generic.h> | 8 | #include <net/sch_generic.h> |
| 9 | #include <net/pkt_sched.h> | 9 | #include <net/pkt_sched.h> |
| @@ -107,7 +107,8 @@ struct tc_action_ops { | |||
| 107 | char kind[IFNAMSIZ]; | 107 | char kind[IFNAMSIZ]; |
| 108 | __u32 type; /* TBD to match kind */ | 108 | __u32 type; /* TBD to match kind */ |
| 109 | struct module *owner; | 109 | struct module *owner; |
| 110 | int (*act)(struct sk_buff *, const struct tc_action *, struct tcf_result *); | 110 | int (*act)(struct sk_buff *, const struct tc_action *, |
| 111 | struct tcf_result *); | ||
| 111 | int (*dump)(struct sk_buff *, struct tc_action *, int, int); | 112 | int (*dump)(struct sk_buff *, struct tc_action *, int, int); |
| 112 | void (*cleanup)(struct tc_action *, int bind); | 113 | void (*cleanup)(struct tc_action *, int bind); |
| 113 | int (*lookup)(struct net *, struct tc_action *, u32); | 114 | int (*lookup)(struct net *, struct tc_action *, u32); |
| @@ -125,8 +126,8 @@ struct tc_action_net { | |||
| 125 | }; | 126 | }; |
| 126 | 127 | ||
| 127 | static inline | 128 | static inline |
| 128 | int tc_action_net_init(struct tc_action_net *tn, const struct tc_action_ops *ops, | 129 | int tc_action_net_init(struct tc_action_net *tn, |
| 129 | unsigned int mask) | 130 | const struct tc_action_ops *ops, unsigned int mask) |
| 130 | { | 131 | { |
| 131 | int err = 0; | 132 | int err = 0; |
| 132 | 133 | ||
| @@ -169,7 +170,8 @@ static inline int tcf_hash_release(struct tc_action *a, bool bind) | |||
| 169 | } | 170 | } |
| 170 | 171 | ||
| 171 | int tcf_register_action(struct tc_action_ops *a, struct pernet_operations *ops); | 172 | int tcf_register_action(struct tc_action_ops *a, struct pernet_operations *ops); |
| 172 | int tcf_unregister_action(struct tc_action_ops *a, struct pernet_operations *ops); | 173 | int tcf_unregister_action(struct tc_action_ops *a, |
| 174 | struct pernet_operations *ops); | ||
| 173 | int tcf_action_destroy(struct list_head *actions, int bind); | 175 | int tcf_action_destroy(struct list_head *actions, int bind); |
| 174 | int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions, | 176 | int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions, |
| 175 | struct tcf_result *res); | 177 | struct tcf_result *res); |
diff --git a/include/net/tc_act/tc_defact.h b/include/net/tc_act/tc_defact.h index 9763dcbb9bc3..ab9b5d6be67b 100644 --- a/include/net/tc_act/tc_defact.h +++ b/include/net/tc_act/tc_defact.h | |||
| @@ -5,8 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | struct tcf_defact { | 6 | struct tcf_defact { |
| 7 | struct tcf_common common; | 7 | struct tcf_common common; |
| 8 | u32 tcfd_datalen; | 8 | u32 tcfd_datalen; |
| 9 | void *tcfd_defdata; | 9 | void *tcfd_defdata; |
| 10 | }; | 10 | }; |
| 11 | #define to_defact(a) \ | 11 | #define to_defact(a) \ |
| 12 | container_of(a->priv, struct tcf_defact, common) | 12 | container_of(a->priv, struct tcf_defact, common) |
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 9ba1410bd21d..5702e933dc07 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h | |||
| @@ -115,8 +115,8 @@ struct tc_police { | |||
| 115 | __u32 mtu; | 115 | __u32 mtu; |
| 116 | struct tc_ratespec rate; | 116 | struct tc_ratespec rate; |
| 117 | struct tc_ratespec peakrate; | 117 | struct tc_ratespec peakrate; |
| 118 | int refcnt; | 118 | int refcnt; |
| 119 | int bindcnt; | 119 | int bindcnt; |
| 120 | __u32 capab; | 120 | __u32 capab; |
| 121 | }; | 121 | }; |
| 122 | 122 | ||
| @@ -128,7 +128,7 @@ struct tcf_t { | |||
| 128 | }; | 128 | }; |
| 129 | 129 | ||
| 130 | struct tc_cnt { | 130 | struct tc_cnt { |
| 131 | int refcnt; | 131 | int refcnt; |
| 132 | int bindcnt; | 132 | int bindcnt; |
| 133 | }; | 133 | }; |
| 134 | 134 | ||
