History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset contains Netfilter/IPVS for net-next: 1) Add new run_estimation toggle to IPVS to stop the estimation_timer logic, from Dust Li. 2) Relax superfluous dynset check on NFT_SET_TIMEOUT. 3) Add egress hook, from Lukas Wunner. 4) Nowadays, almost all hook functions in x_table land just call the hook evaluation loop. Remove remaining hook wrappers from iptables and IPVS. From Florian Westphal. ====================

David S. Miller committed 5 years ago

Commit 7adaf562 parents c87350c ffdd33d40 files · +389 −349Browse files

Showing the changes to include/uapi (1 of 40 files). Show all

Unified · Split

include/uapi/linux/netfilter.h+1−0
@@ -51,6 +51,7 @@ enum nf_inet_hooks { · 50 unmodified lines
51 51
52enum nf_dev_hooks {52enum nf_dev_hooks {
53 NF_NETDEV_INGRESS,53 NF_NETDEV_INGRESS,
54 NF_NETDEV_EGRESS,
54 NF_NETDEV_NUMHOOKS55 NF_NETDEV_NUMHOOKS
55};56};
56 57

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t