projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' into next
[cascardo/linux.git]
/
net
/
netfilter
/
xt_tcpmss.c
diff --git
a/net/netfilter/xt_tcpmss.c
b/net/netfilter/xt_tcpmss.c
index
6771bf0
..
4809b34
100644
(file)
--- a/
net/netfilter/xt_tcpmss.c
+++ b/
net/netfilter/xt_tcpmss.c
@@
-25,12
+25,9
@@
MODULE_ALIAS("ipt_tcpmss");
MODULE_ALIAS("ip6t_tcpmss");
static bool
MODULE_ALIAS("ip6t_tcpmss");
static bool
-tcpmss_mt(const struct sk_buff *skb, const struct net_device *in,
- const struct net_device *out, const struct xt_match *match,
- const void *matchinfo, int offset, unsigned int protoff,
- bool *hotdrop)
+tcpmss_mt(const struct sk_buff *skb, const struct xt_match_param *par)
{
{
- const struct xt_tcpmss_match_info *info = matchinfo;
+ const struct xt_tcpmss_match_info *info =
par->
matchinfo;
const struct tcphdr *th;
struct tcphdr _tcph;
/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
const struct tcphdr *th;
struct tcphdr _tcph;
/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
@@
-39,7
+36,7
@@
tcpmss_mt(const struct sk_buff *skb, const struct net_device *in,
unsigned int i, optlen;
/* If we don't have the whole header, drop packet. */
unsigned int i, optlen;
/* If we don't have the whole header, drop packet. */
- th = skb_header_pointer(skb, p
rot
off, sizeof(_tcph), &_tcph);
+ th = skb_header_pointer(skb, p
ar->th
off, sizeof(_tcph), &_tcph);
if (th == NULL)
goto dropit;
if (th == NULL)
goto dropit;
@@
-52,7
+49,7
@@
tcpmss_mt(const struct sk_buff *skb, const struct net_device *in,
goto out;
/* Truncated options. */
goto out;
/* Truncated options. */
- op = skb_header_pointer(skb, p
rot
off + sizeof(*th), optlen, _opt);
+ op = skb_header_pointer(skb, p
ar->th
off + sizeof(*th), optlen, _opt);
if (op == NULL)
goto dropit;
if (op == NULL)
goto dropit;
@@
-76,14
+73,14
@@
out:
return info->invert;
dropit:
return info->invert;
dropit:
- *hotdrop = true;
+ *
par->
hotdrop = true;
return false;
}
static struct xt_match tcpmss_mt_reg[] __read_mostly = {
{
.name = "tcpmss",
return false;
}
static struct xt_match tcpmss_mt_reg[] __read_mostly = {
{
.name = "tcpmss",
- .family =
AF_INET
,
+ .family =
NFPROTO_IPV4
,
.match = tcpmss_mt,
.matchsize = sizeof(struct xt_tcpmss_match_info),
.proto = IPPROTO_TCP,
.match = tcpmss_mt,
.matchsize = sizeof(struct xt_tcpmss_match_info),
.proto = IPPROTO_TCP,
@@
-91,7
+88,7
@@
static struct xt_match tcpmss_mt_reg[] __read_mostly = {
},
{
.name = "tcpmss",
},
{
.name = "tcpmss",
- .family =
AF_INET
6,
+ .family =
NFPROTO_IPV
6,
.match = tcpmss_mt,
.matchsize = sizeof(struct xt_tcpmss_match_info),
.proto = IPPROTO_TCP,
.match = tcpmss_mt,
.matchsize = sizeof(struct xt_tcpmss_match_info),
.proto = IPPROTO_TCP,