git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
netfilter_ipv4
/
ip_conntrack_helper_h323_types.h
diff --git
a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
index
cc98f7a
..
3d4a773
100644
(file)
--- a/
include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
+++ b/
include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
@@
-1,4
+1,4
@@
-/* Generated by Jing Min Zhao's ASN.1 parser,
Mar 15
2006
+/* Generated by Jing Min Zhao's ASN.1 parser,
Apr 20
2006
*
* Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
*
*
* Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
*
@@
-412,6
+412,7
@@
typedef struct Facility_UUIE { /* SEQUENCE */
eFacility_UUIE_destinationInfo = (1 << 14),
eFacility_UUIE_h245SecurityMode = (1 << 13),
} options;
eFacility_UUIE_destinationInfo = (1 << 14),
eFacility_UUIE_h245SecurityMode = (1 << 13),
} options;
+ TransportAddress alternativeAddress;
FacilityReason reason;
TransportAddress h245Address;
Facility_UUIE_fastStart fastStart;
FacilityReason reason;
TransportAddress h245Address;
Facility_UUIE_fastStart fastStart;