summaryrefslogtreecommitdiff
path: root/net/netfilter/nf_conntrack_standalone.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-05-01 16:20:05 -0700
committerDavid S. Miller <davem@davemloft.net>2020-05-01 17:02:12 -0700
commit5b95dea31636ce93660930d16172fe75589b2e70 (patch)
treeaa8816542b1df830bb1a5f69e261af5328ec420f /net/netfilter/nf_conntrack_standalone.c
parent47c0b5806f21b4806e5d9d57e08069320e34e835 (diff)
parentb45e7f98ab7c2d7035d92100ee011584693eccce (diff)
Merge branch 'net-smc-extent-buffer-mapping-and-port-handling'
Karsten Graul says: ==================== net/smc: extent buffer mapping and port handling Add functionality to map/unmap and register/unregister memory buffers for specific SMC-R links and for the whole link group. Prepare LLC layer messages for the support of multiple links and extent the processing of adapter events. And add further small preparations needed for the SMC-R failover support. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_standalone.c')
0 files changed, 0 insertions, 0 deletions