aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorTobin C Harding <me@tobin.cc>2016-05-09 21:26:57 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2016-06-07 11:15:29 -0400
commit402f9030cb68d235cfa94b898e96f2d6f7da76ae (patch)
tree1e66322834cda4a8e532e967ba478f277dbbdaa2 /net/bridge
parent2fb7ea455d57e22110c54fc2de0656b6f744263c (diff)
bridge: netfilter: checkpatch data type fixes
checkpatch produces data type 'checks'. This patch amends them by changing, for example: uint8_t -> u8 Signed-off-by: Tobin C Harding <me@tobin.cc> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/netfilter/ebt_stp.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c
index 6b731e12ecfa..e77f90bf8db3 100644
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
@@ -17,24 +17,24 @@
17#define BPDU_TYPE_TCN 0x80 17#define BPDU_TYPE_TCN 0x80
18 18
19struct stp_header { 19struct stp_header {
20 uint8_t dsap; 20 u8 dsap;
21 uint8_t ssap; 21 u8 ssap;
22 uint8_t ctrl; 22 u8 ctrl;
23 uint8_t pid; 23 u8 pid;
24 uint8_t vers; 24 u8 vers;
25 uint8_t type; 25 u8 type;
26}; 26};
27 27
28struct stp_config_pdu { 28struct stp_config_pdu {
29 uint8_t flags; 29 u8 flags;
30 uint8_t root[8]; 30 u8 root[8];
31 uint8_t root_cost[4]; 31 u8 root_cost[4];
32 uint8_t sender[8]; 32 u8 sender[8];
33 uint8_t port[2]; 33 u8 port[2];
34 uint8_t msg_age[2]; 34 u8 msg_age[2];
35 uint8_t max_age[2]; 35 u8 max_age[2];
36 uint8_t hello_time[2]; 36 u8 hello_time[2];
37 uint8_t forward_delay[2]; 37 u8 forward_delay[2];
38}; 38};
39 39
40#define NR16(p) (p[0] << 8 | p[1]) 40#define NR16(p) (p[0] << 8 | p[1])
@@ -44,8 +44,8 @@ static bool ebt_filter_config(const struct ebt_stp_info *info,
44 const struct stp_config_pdu *stpc) 44 const struct stp_config_pdu *stpc)
45{ 45{
46 const struct ebt_stp_config_info *c; 46 const struct ebt_stp_config_info *c;
47 uint16_t v16; 47 u16 v16;
48 uint32_t v32; 48 u32 v32;
49 int verdict, i; 49 int verdict, i;
50 50
51 c = &info->config; 51 c = &info->config;
@@ -125,7 +125,7 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
125 const struct ebt_stp_info *info = par->matchinfo; 125 const struct ebt_stp_info *info = par->matchinfo;
126 const struct stp_header *sp; 126 const struct stp_header *sp;
127 struct stp_header _stph; 127 struct stp_header _stph;
128 const uint8_t header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00}; 128 const u8 header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00};
129 129
130 sp = skb_header_pointer(skb, 0, sizeof(_stph), &_stph); 130 sp = skb_header_pointer(skb, 0, sizeof(_stph), &_stph);
131 if (sp == NULL) 131 if (sp == NULL)
@@ -156,8 +156,8 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
156static int ebt_stp_mt_check(const struct xt_mtchk_param *par) 156static int ebt_stp_mt_check(const struct xt_mtchk_param *par)
157{ 157{
158 const struct ebt_stp_info *info = par->matchinfo; 158 const struct ebt_stp_info *info = par->matchinfo;
159 const uint8_t bridge_ula[6] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00}; 159 const u8 bridge_ula[6] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00};
160 const uint8_t msk[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 160 const u8 msk[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
161 const struct ebt_entry *e = par->entryinfo; 161 const struct ebt_entry *e = par->entryinfo;
162 162
163 if (info->bitmask & ~EBT_STP_MASK || info->invflags & ~EBT_STP_MASK || 163 if (info->bitmask & ~EBT_STP_MASK || info->invflags & ~EBT_STP_MASK ||