projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'zynq-dt-fixes-for-3.15' of git://git.xilinx.com/linux-xlnx into fixes
[cascardo/linux.git]
/
net
/
ipv4
/
netfilter
/
nf_nat_pptp.c
diff --git
a/net/ipv4/netfilter/nf_nat_pptp.c
b/net/ipv4/netfilter/nf_nat_pptp.c
index
a06d7d7
..
657d230
100644
(file)
--- a/
net/ipv4/netfilter/nf_nat_pptp.c
+++ b/
net/ipv4/netfilter/nf_nat_pptp.c
@@
-13,6
+13,8
@@
*
* Development of this code funded by Astaro AG (http://www.astaro.com/)
*
+ * (C) 2006-2012 Patrick McHardy <kaber@trash.net>
+ *
* TODO: - NAT to a unique tuple, not to TCP source port
* (needs netfilter tuple reservation)
*/