projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'kumar/merge' into merge
[cascardo/linux.git]
/
net
/
bridge
/
netfilter
/
ebt_pkttype.c
diff --git
a/net/bridge/netfilter/ebt_pkttype.c
b/net/bridge/netfilter/ebt_pkttype.c
index
e2a07e6
..
496a565
100644
(file)
--- a/
net/bridge/netfilter/ebt_pkttype.c
+++ b/
net/bridge/netfilter/ebt_pkttype.c
@@
-13,21
+13,21
@@
#include <linux/netfilter_bridge/ebt_pkttype.h>
static bool
#include <linux/netfilter_bridge/ebt_pkttype.h>
static bool
-ebt_pkttype_mt(const struct sk_buff *skb,
const struct xt_match
_param *par)
+ebt_pkttype_mt(const struct sk_buff *skb,
struct xt_action
_param *par)
{
const struct ebt_pkttype_info *info = par->matchinfo;
return (skb->pkt_type == info->pkt_type) ^ info->invert;
}
{
const struct ebt_pkttype_info *info = par->matchinfo;
return (skb->pkt_type == info->pkt_type) ^ info->invert;
}
-static
bool
ebt_pkttype_mt_check(const struct xt_mtchk_param *par)
+static
int
ebt_pkttype_mt_check(const struct xt_mtchk_param *par)
{
const struct ebt_pkttype_info *info = par->matchinfo;
if (info->invert != 0 && info->invert != 1)
{
const struct ebt_pkttype_info *info = par->matchinfo;
if (info->invert != 0 && info->invert != 1)
- return
false
;
+ return
-EINVAL
;
/* Allow any pkt_type value */
/* Allow any pkt_type value */
- return
true
;
+ return
0
;
}
static struct xt_match ebt_pkttype_mt_reg __read_mostly = {
}
static struct xt_match ebt_pkttype_mt_reg __read_mostly = {