Commit 052a4bc4 authored by Ian Morris's avatar Ian Morris Committed by Pablo Neira Ayuso

netfilter-bridge: Cleanse indentation

Fixes a bunch of issues detected by checkpatch with regards to code
indentation.

No changes detected by objdiff.
Signed-off-by: default avatarIan Morris <ipm@chirality.org.uk>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1ffad83d
...@@ -41,7 +41,7 @@ struct stp_config_pdu { ...@@ -41,7 +41,7 @@ struct stp_config_pdu {
#define NR32(p) ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]) #define NR32(p) ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3])
static bool ebt_filter_config(const struct ebt_stp_info *info, static bool ebt_filter_config(const struct ebt_stp_info *info,
const struct stp_config_pdu *stpc) const struct stp_config_pdu *stpc)
{ {
const struct ebt_stp_config_info *c; const struct ebt_stp_config_info *c;
uint16_t v16; uint16_t v16;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \ #define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \
(1 << NF_BR_LOCAL_OUT)) (1 << NF_BR_LOCAL_OUT))
static struct ebt_entries initial_chains[] = { static struct ebt_entries initial_chains[] = {
{ {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \ #define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \
(1 << NF_BR_POST_ROUTING)) (1 << NF_BR_POST_ROUTING))
static struct ebt_entries initial_chains[] = { static struct ebt_entries initial_chains[] = {
{ {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1)) #define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))
#define COUNTER_OFFSET(n) (SMP_ALIGN(n * sizeof(struct ebt_counter))) #define COUNTER_OFFSET(n) (SMP_ALIGN(n * sizeof(struct ebt_counter)))
#define COUNTER_BASE(c, n, cpu) ((struct ebt_counter *)(((char *)c) + \ #define COUNTER_BASE(c, n, cpu) ((struct ebt_counter *)(((char *)c) + \
COUNTER_OFFSET(n) * cpu)) COUNTER_OFFSET(n) * cpu))
...@@ -126,7 +126,7 @@ ebt_dev_check(const char *entry, const struct net_device *device) ...@@ -126,7 +126,7 @@ ebt_dev_check(const char *entry, const struct net_device *device)
/* process standard matches */ /* process standard matches */
static inline int static inline int
ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb, ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
const struct net_device *in, const struct net_device *out) const struct net_device *in, const struct net_device *out)
{ {
const struct ethhdr *h = eth_hdr(skb); const struct ethhdr *h = eth_hdr(skb);
const struct net_bridge_port *p; const struct net_bridge_port *p;
...@@ -323,7 +323,7 @@ unsigned int ebt_do_table(struct sk_buff *skb, ...@@ -323,7 +323,7 @@ unsigned int ebt_do_table(struct sk_buff *skb,
/* If it succeeds, returns element and locks mutex */ /* If it succeeds, returns element and locks mutex */
static inline void * static inline void *
find_inlist_lock_noload(struct list_head *head, const char *name, int *error, find_inlist_lock_noload(struct list_head *head, const char *name, int *error,
struct mutex *mutex) struct mutex *mutex)
{ {
struct { struct {
struct list_head list; struct list_head list;
...@@ -342,7 +342,7 @@ find_inlist_lock_noload(struct list_head *head, const char *name, int *error, ...@@ -342,7 +342,7 @@ find_inlist_lock_noload(struct list_head *head, const char *name, int *error,
static void * static void *
find_inlist_lock(struct list_head *head, const char *name, const char *prefix, find_inlist_lock(struct list_head *head, const char *name, const char *prefix,
int *error, struct mutex *mutex) int *error, struct mutex *mutex)
{ {
return try_then_request_module( return try_then_request_module(
find_inlist_lock_noload(head, name, error, mutex), find_inlist_lock_noload(head, name, error, mutex),
...@@ -493,9 +493,9 @@ static int ebt_verify_pointers(const struct ebt_replace *repl, ...@@ -493,9 +493,9 @@ static int ebt_verify_pointers(const struct ebt_replace *repl,
*/ */
static inline int static inline int
ebt_check_entry_size_and_hooks(const struct ebt_entry *e, ebt_check_entry_size_and_hooks(const struct ebt_entry *e,
const struct ebt_table_info *newinfo, const struct ebt_table_info *newinfo,
unsigned int *n, unsigned int *cnt, unsigned int *n, unsigned int *cnt,
unsigned int *totalcnt, unsigned int *udc_cnt) unsigned int *totalcnt, unsigned int *udc_cnt)
{ {
int i; int i;
...@@ -562,7 +562,7 @@ struct ebt_cl_stack ...@@ -562,7 +562,7 @@ struct ebt_cl_stack
*/ */
static inline int static inline int
ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo, ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo,
unsigned int *n, struct ebt_cl_stack *udc) unsigned int *n, struct ebt_cl_stack *udc)
{ {
int i; int i;
...@@ -649,9 +649,9 @@ ebt_cleanup_entry(struct ebt_entry *e, struct net *net, unsigned int *cnt) ...@@ -649,9 +649,9 @@ ebt_cleanup_entry(struct ebt_entry *e, struct net *net, unsigned int *cnt)
static inline int static inline int
ebt_check_entry(struct ebt_entry *e, struct net *net, ebt_check_entry(struct ebt_entry *e, struct net *net,
const struct ebt_table_info *newinfo, const struct ebt_table_info *newinfo,
const char *name, unsigned int *cnt, const char *name, unsigned int *cnt,
struct ebt_cl_stack *cl_s, unsigned int udc_cnt) struct ebt_cl_stack *cl_s, unsigned int udc_cnt)
{ {
struct ebt_entry_target *t; struct ebt_entry_target *t;
struct xt_target *target; struct xt_target *target;
...@@ -764,7 +764,7 @@ ebt_check_entry(struct ebt_entry *e, struct net *net, ...@@ -764,7 +764,7 @@ ebt_check_entry(struct ebt_entry *e, struct net *net,
* accessed. This mask is a parameter to the check() functions of the extensions * accessed. This mask is a parameter to the check() functions of the extensions
*/ */
static int check_chainloops(const struct ebt_entries *chain, struct ebt_cl_stack *cl_s, static int check_chainloops(const struct ebt_entries *chain, struct ebt_cl_stack *cl_s,
unsigned int udc_cnt, unsigned int hooknr, char *base) unsigned int udc_cnt, unsigned int hooknr, char *base)
{ {
int i, chain_nr = -1, pos = 0, nentries = chain->nentries, verdict; int i, chain_nr = -1, pos = 0, nentries = chain->nentries, verdict;
const struct ebt_entry *e = (struct ebt_entry *)chain->data; const struct ebt_entry *e = (struct ebt_entry *)chain->data;
...@@ -955,7 +955,7 @@ static int translate_table(struct net *net, const char *name, ...@@ -955,7 +955,7 @@ static int translate_table(struct net *net, const char *name,
/* called under write_lock */ /* called under write_lock */
static void get_counters(const struct ebt_counter *oldcounters, static void get_counters(const struct ebt_counter *oldcounters,
struct ebt_counter *counters, unsigned int nentries) struct ebt_counter *counters, unsigned int nentries)
{ {
int i, cpu; int i, cpu;
struct ebt_counter *counter_base; struct ebt_counter *counter_base;
...@@ -1342,7 +1342,7 @@ static int update_counters(struct net *net, const void __user *user, ...@@ -1342,7 +1342,7 @@ static int update_counters(struct net *net, const void __user *user,
} }
static inline int ebt_make_matchname(const struct ebt_entry_match *m, static inline int ebt_make_matchname(const struct ebt_entry_match *m,
const char *base, char __user *ubase) const char *base, char __user *ubase)
{ {
char __user *hlp = ubase + ((char *)m - base); char __user *hlp = ubase + ((char *)m - base);
char name[EBT_FUNCTION_MAXNAMELEN] = {}; char name[EBT_FUNCTION_MAXNAMELEN] = {};
...@@ -1356,7 +1356,7 @@ static inline int ebt_make_matchname(const struct ebt_entry_match *m, ...@@ -1356,7 +1356,7 @@ static inline int ebt_make_matchname(const struct ebt_entry_match *m,
} }
static inline int ebt_make_watchername(const struct ebt_entry_watcher *w, static inline int ebt_make_watchername(const struct ebt_entry_watcher *w,
const char *base, char __user *ubase) const char *base, char __user *ubase)
{ {
char __user *hlp = ubase + ((char *)w - base); char __user *hlp = ubase + ((char *)w - base);
char name[EBT_FUNCTION_MAXNAMELEN] = {}; char name[EBT_FUNCTION_MAXNAMELEN] = {};
...@@ -1367,8 +1367,8 @@ static inline int ebt_make_watchername(const struct ebt_entry_watcher *w, ...@@ -1367,8 +1367,8 @@ static inline int ebt_make_watchername(const struct ebt_entry_watcher *w,
return 0; return 0;
} }
static inline int static inline int ebt_make_names(struct ebt_entry *e, const char *base,
ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase) char __user *ubase)
{ {
int ret; int ret;
char __user *hlp; char __user *hlp;
...@@ -1394,9 +1394,9 @@ ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase) ...@@ -1394,9 +1394,9 @@ ebt_make_names(struct ebt_entry *e, const char *base, char __user *ubase)
} }
static int copy_counters_to_user(struct ebt_table *t, static int copy_counters_to_user(struct ebt_table *t,
const struct ebt_counter *oldcounters, const struct ebt_counter *oldcounters,
void __user *user, unsigned int num_counters, void __user *user, unsigned int num_counters,
unsigned int nentries) unsigned int nentries)
{ {
struct ebt_counter *counterstmp; struct ebt_counter *counterstmp;
int ret = 0; int ret = 0;
...@@ -1427,7 +1427,7 @@ static int copy_counters_to_user(struct ebt_table *t, ...@@ -1427,7 +1427,7 @@ static int copy_counters_to_user(struct ebt_table *t,
/* called with ebt_mutex locked */ /* called with ebt_mutex locked */
static int copy_everything_to_user(struct ebt_table *t, void __user *user, static int copy_everything_to_user(struct ebt_table *t, void __user *user,
const int *len, int cmd) const int *len, int cmd)
{ {
struct ebt_replace tmp; struct ebt_replace tmp;
const struct ebt_counter *oldcounters; const struct ebt_counter *oldcounters;
...@@ -2305,7 +2305,7 @@ static int compat_do_ebt_set_ctl(struct sock *sk, ...@@ -2305,7 +2305,7 @@ static int compat_do_ebt_set_ctl(struct sock *sk,
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
} }
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment