summaryrefslogtreecommitdiff
path: root/include/scsi/fc_encode.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-03 15:16:46 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-03 15:16:46 -0500
commit5a0fd98b7b5be8773c53c40c47451ec6cd11d1ff (patch)
tree56e1c64262e3ef4876e8d480555508d6a45358e7 /include/scsi/fc_encode.h
parent3541f9e8bdebce02458882b66b638d7302c1f616 (diff)
parent295a6e06d21e1f469c9f38b00125a13b60ad4e7c (diff)
Merge branch 'ife-to-module'
Yotam Gigi says: ==================== Extract IFE logic to module Extract ife logic from the tc_ife action into an independent module, and make the tc_ife action use it. This way, the ife encapsulation can be used by other modules other than tc_ife action. v1->v2: Fix duplicate symbol error by introducing a new patch that makes the original symbol static. The symbol ife_tlv_meta_extract is exported in act_ife, though not being used by any other module. As the symbol is being moved to the new ife module, introducing the new module creates duplicate symbol. To fix it, add a new patch (1/3) that makes the ife_tlv_meta_extract symbol static in act_ife, thus the symbol does not collide. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/scsi/fc_encode.h')
0 files changed, 0 insertions, 0 deletions
ath to add table, set and stateful objects and code consolidation when unregister chain hooks, from Gao Feng. 10) Fix harmless reference counter underflow in IPVS that, however, results in problems with the introduction of the new refcount_t type, from David Windsor. 11) Enable LIBCRC32C from nf_ct_sctp instead of nf_nat_sctp, from Davide Caratti. 12) Missing documentation on nf_tables uapi header, from Liping Zhang. 13) Use rb_entry() helper in xt_connlimit, from Geliang Tang. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6_tables.c21
-rw-r--r--net/ipv6/netfilter/ip6t_NPT.c2
-rw-r--r--net/ipv6/netfilter/ip6t_SYNPROXY.c11
-rw-r--r--net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c20
-rw-r--r--net/ipv6/netfilter/nf_defrag_ipv6_hooks.c4
-rw-r--r--net/ipv6/netfilter/nf_dup_ipv6.c7
-rw-r--r--net/ipv6/netfilter/nf_log_ipv6.c2
7 files changed, 28 insertions, 39 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c