diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-16 18:23:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 18:23:54 -0500 |
| commit | 354ade9058687fdef8a612c7b298d4c51dae3da7 (patch) | |
| tree | 842cf24f53e8451058afa9a58a4ac7e54c7099be /include | |
| parent | 9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b (diff) | |
| parent | bb5f133dbc4f04b6388715d364ae5865455166c2 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/enc28j60.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/nfnetlink_conntrack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h index c19595c8930..29fe9ea1d34 100644 --- a/include/linux/netfilter/nfnetlink_conntrack.h +++ b/include/linux/netfilter/nfnetlink_conntrack.h | |||
| @@ -141,6 +141,7 @@ enum ctattr_protonat { | |||
| 141 | #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) | 141 | #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) |
| 142 | 142 | ||
| 143 | enum ctattr_natseq { | 143 | enum ctattr_natseq { |
| 144 | CTA_NAT_SEQ_UNSPEC, | ||
| 144 | CTA_NAT_SEQ_CORRECTION_POS, | 145 | CTA_NAT_SEQ_CORRECTION_POS, |
| 145 | CTA_NAT_SEQ_OFFSET_BEFORE, | 146 | CTA_NAT_SEQ_OFFSET_BEFORE, |
| 146 | CTA_NAT_SEQ_OFFSET_AFTER, | 147 | CTA_NAT_SEQ_OFFSET_AFTER, |