diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 16:15:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 16:47:38 -0500 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /net/l2tp | |
| parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
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 04635e88e8ed..110efb704c9b 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c | |||
| @@ -672,4 +672,8 @@ MODULE_LICENSE("GPL"); | |||
| 672 | MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); | 672 | MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); |
| 673 | MODULE_DESCRIPTION("L2TP over IP"); | 673 | MODULE_DESCRIPTION("L2TP over IP"); |
| 674 | MODULE_VERSION("1.0"); | 674 | MODULE_VERSION("1.0"); |
| 675 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, SOCK_DGRAM, IPPROTO_L2TP); | 675 | |
| 676 | /* Use the value of SOCK_DGRAM (2) directory, because __stringify does't like | ||
| 677 | * enums | ||
| 678 | */ | ||
| 679 | MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP); | ||