git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
include
/
linux
/
netfilter
/
nf_conntrack_sip.h
diff --git
a/include/linux/netfilter/nf_conntrack_sip.h
b/include/linux/netfilter/nf_conntrack_sip.h
index
5da04e5
..
23aa2ec
100644
(file)
--- a/
include/linux/netfilter/nf_conntrack_sip.h
+++ b/
include/linux/netfilter/nf_conntrack_sip.h
@@
-7,6
+7,7
@@
struct nf_ct_sip_master {
unsigned int register_cseq;
+ unsigned int invite_cseq;
};
enum sip_expectation_classes {