projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: Replace sk_buff ** with sk_buff *
[firefly-linux-kernel-4.4.55.git]
/
net
/
netfilter
/
nf_conntrack_netbios_ns.c
diff --git
a/net/netfilter/nf_conntrack_netbios_ns.c
b/net/netfilter/nf_conntrack_netbios_ns.c
index 1093478cc007c349c0eef2dd2dbf9b2f5cc95fea..9810d81e2a06df129db9f0655556fabf3ce5acf8 100644
(file)
--- a/
net/netfilter/nf_conntrack_netbios_ns.c
+++ b/
net/netfilter/nf_conntrack_netbios_ns.c
@@
-42,17
+42,17
@@
static unsigned int timeout __read_mostly = 3;
module_param(timeout, uint, 0400);
MODULE_PARM_DESC(timeout, "timeout for master connection/replies in seconds");
module_param(timeout, uint, 0400);
MODULE_PARM_DESC(timeout, "timeout for master connection/replies in seconds");
-static int help(struct sk_buff *
*p
skb, unsigned int protoff,
+static int help(struct sk_buff *skb, unsigned int protoff,
struct nf_conn *ct, enum ip_conntrack_info ctinfo)
{
struct nf_conntrack_expect *exp;
struct nf_conn *ct, enum ip_conntrack_info ctinfo)
{
struct nf_conntrack_expect *exp;
- struct iphdr *iph = ip_hdr(
*p
skb);
- struct rtable *rt = (struct rtable *)
(*pskb)
->dst;
+ struct iphdr *iph = ip_hdr(skb);
+ struct rtable *rt = (struct rtable *)
skb
->dst;
struct in_device *in_dev;
__be32 mask = 0;
/* we're only interested in locally generated packets */
struct in_device *in_dev;
__be32 mask = 0;
/* we're only interested in locally generated packets */
- if (
(*pskb)
->sk == NULL)
+ if (
skb
->sk == NULL)
goto out;
if (rt == NULL || !(rt->rt_flags & RTCF_BROADCAST))
goto out;
goto out;
if (rt == NULL || !(rt->rt_flags & RTCF_BROADCAST))
goto out;
@@
-74,7
+74,7
@@
static int help(struct sk_buff **pskb, unsigned int protoff,
if (mask == 0)
goto out;
if (mask == 0)
goto out;
- exp = nf_c
onntrack
_expect_alloc(ct);
+ exp = nf_c
t
_expect_alloc(ct);
if (exp == NULL)
goto out;
if (exp == NULL)
goto out;
@@
-83,18
+83,15
@@
static int help(struct sk_buff **pskb, unsigned int protoff,
exp->mask.src.u3.ip = mask;
exp->mask.src.u.udp.port = htons(0xFFFF);
exp->mask.src.u3.ip = mask;
exp->mask.src.u.udp.port = htons(0xFFFF);
- exp->mask.dst.u3.ip = htonl(0xFFFFFFFF);
- exp->mask.dst.u.udp.port = htons(0xFFFF);
- exp->mask.dst.protonum = 0xFF;
exp->expectfn = NULL;
exp->flags = NF_CT_EXPECT_PERMANENT;
exp->helper = NULL;
exp->expectfn = NULL;
exp->flags = NF_CT_EXPECT_PERMANENT;
exp->helper = NULL;
- nf_c
onntrack
_expect_related(exp);
- nf_c
onntrack
_expect_put(exp);
+ nf_c
t
_expect_related(exp);
+ nf_c
t
_expect_put(exp);
- nf_ct_refresh(ct,
*p
skb, timeout * HZ);
+ nf_ct_refresh(ct, skb, timeout * HZ);
out:
return NF_ACCEPT;
}
out:
return NF_ACCEPT;
}
@@
-104,9
+101,6
@@
static struct nf_conntrack_helper helper __read_mostly = {
.tuple.src.l3num = AF_INET,
.tuple.src.u.udp.port = __constant_htons(NMBD_PORT),
.tuple.dst.protonum = IPPROTO_UDP,
.tuple.src.l3num = AF_INET,
.tuple.src.u.udp.port = __constant_htons(NMBD_PORT),
.tuple.dst.protonum = IPPROTO_UDP,
- .mask.src.l3num = 0xFFFF,
- .mask.src.u.udp.port = __constant_htons(0xFFFF),
- .mask.dst.protonum = 0xFF,
.max_expected = 1,
.me = THIS_MODULE,
.help = help,
.max_expected = 1,
.me = THIS_MODULE,
.help = help,