projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "brcmfmac: move configuration of probe request IEs"
[platform/kernel/linux-rpi.git]
/
net
/
netfilter
/
nf_conntrack_sip.c
diff --git
a/net/netfilter/nf_conntrack_sip.c
b/net/netfilter/nf_conntrack_sip.c
index
b83dc9b
..
78fd912
100644
(file)
--- a/
net/netfilter/nf_conntrack_sip.c
+++ b/
net/netfilter/nf_conntrack_sip.c
@@
-477,7
+477,7
@@
static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,
return ret;
if (ret == 0)
break;
- dataoff
+
= *matchoff;
+ dataoff = *matchoff;
}
*in_header = 0;
}
@@
-489,7
+489,7
@@
static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,
break;
if (ret == 0)
return ret;
- dataoff
+
= *matchoff;
+ dataoff = *matchoff;
}
if (in_header)