aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-16 15:23:35 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-16 15:23:35 -0700
commit82f437b95052f99cafb8b4f39b08ad1d0b05c30d (patch)
tree45de8eb885bb2e77b1c93bc816756ab89d93caa3 /drivers/net/ethernet
parentinclude/net/dst.h: neaten asterisk placement (diff)
parentnetfilter: add user-space connection tracking helper infrastructure (diff)
downloadlinux-dev-82f437b95052f99cafb8b4f39b08ad1d0b05c30d.tar.xz
linux-dev-82f437b95052f99cafb8b4f39b08ad1d0b05c30d.zip
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo says: ==================== This is the second batch of Netfilter updates for net-next. It contains the kernel changes for the new user-space connection tracking helper infrastructure. More details on this infrastructure are provides here: http://lwn.net/Articles/500196/ Still, I plan to provide some official documentation through the conntrack-tools user manual on how to setup user-space utilities for this. So far, it provides two helper in user-space, one for NFSv3 and another for Oracle/SQLnet/TNS. Yet in my TODO list. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions