forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net 1) Module autoload for masquerade and redirection does not work. 2) Leak in unqueued packets in nf_ct_frag6_queue(). Ignore duplicated fragments, pretend they are placed into the queue. Patches from Guillaume Nault. ==================== Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
3 changed files
with
14 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -307,5 +307,4 @@ module_exit(nft_masq_module_exit); | |
|
||
MODULE_LICENSE("GPL"); | ||
MODULE_AUTHOR("Arturo Borrero Gonzalez <[email protected]>"); | ||
MODULE_ALIAS_NFT_AF_EXPR(AF_INET6, "masq"); | ||
MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "masq"); | ||
MODULE_ALIAS_NFT_EXPR("masq"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -294,5 +294,4 @@ module_exit(nft_redir_module_exit); | |
|
||
MODULE_LICENSE("GPL"); | ||
MODULE_AUTHOR("Arturo Borrero Gonzalez <[email protected]>"); | ||
MODULE_ALIAS_NFT_AF_EXPR(AF_INET, "redir"); | ||
MODULE_ALIAS_NFT_AF_EXPR(AF_INET6, "redir"); | ||
MODULE_ALIAS_NFT_EXPR("nat"); |