Unverified Commit 468c9468 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9266 MPTCP Upstream part 7 

Merge Pull Request from: @geliangtang 
 
mptcp: Fixes and cleanup for v6.7

Patches 1-2 clean up kernel code by removing unused parameters, making
more consistent use of existing helper functions, and reducing extra
casting of socket pointers.

Patch 3 removes an unused variable in a selftest script.

Patch 4 fix W=1 build warnings if module is built without a MODULE_DESCRIPTION(). 
 
Link:https://gitee.com/openeuler/kernel/pulls/9266

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 32586d52 ec54fef6

net/ipv4/inet_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -1481,5 +1481,6 @@ static void __exit inet_diag_exit(void) 
module_init(inet_diag_init);

module_exit(inet_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("INET/INET6: socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2 /* AF_INET */);

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 10 /* AF_INET6 */);

net/ipv4/raw_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -257,5 +257,6 @@ static void __exit raw_diag_exit(void) 
module_init(raw_diag_init);

module_exit(raw_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("RAW socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-255 /* AF_INET - IPPROTO_RAW */);

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 10-255 /* AF_INET6 - IPPROTO_RAW */);

net/ipv4/tcp_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -247,4 +247,5 @@ static void __exit tcp_diag_exit(void) 
module_init(tcp_diag_init);

module_exit(tcp_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("TCP socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-6 /* AF_INET - IPPROTO_TCP */);

net/ipv4/udp_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -296,5 +296,6 @@ static void __exit udp_diag_exit(void) 
module_init(udp_diag_init);

module_exit(udp_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("UDP socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-17 /* AF_INET - IPPROTO_UDP */);

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-136 /* AF_INET - IPPROTO_UDPLITE */);

net/mptcp/mptcp_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -245,4 +245,5 @@ static void __exit mptcp_diag_exit(void) 
module_init(mptcp_diag_init);

module_exit(mptcp_diag_exit);

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("MPTCP socket monitoring via SOCK_DIAG");

MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 2-262 /* AF_INET - IPPROTO_MPTCP */);