diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /net/l2tp | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 226a0ae3bcfd..a2cec796a321 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c | |||
| @@ -676,4 +676,8 @@ MODULE_LICENSE("GPL"); | |||
| 676 | MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); | 676 | MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); |
| 677 | MODULE_DESCRIPTION("L2TP over IP"); | 677 | MODULE_DESCRIPTION("L2TP over IP"); |
| 678 | MODULE_VERSION("1.0"); | 678 | MODULE_VERSION("1.0"); |
| 679 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, SOCK_DGRAM, IPPROTO_L2TP); | 679 | |
| 680 | /* Use the value of SOCK_DGRAM (2) directory, because __stringify does't like | ||
| 681 | * enums | ||
| 682 | */ | ||
| 683 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP); | ||