1 files changed, 2 insertions, 6 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index dd4d506ef923..4c04848953bd 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1808,6 +1808,7 @@ out:
                 rv = (flags & MSG_PEEK) ? -sk->sk_err : sock_error(sk);
 
         if ((rv >= 0) && msg->msg_name) {
+                __sockaddr_check_size(sizeof(struct sockaddr_dn));
                 memcpy(msg->msg_name, &scp->peer, sizeof(struct sockaddr_dn));
                 msg->msg_namelen = sizeof(struct sockaddr_dn);
         }
@@ -1914,7 +1915,7 @@ static int dn_sendmsg(struct kiocb *iocb, struct socket *sock,
         int err = 0;
         size_t sent = 0;
         int addr_len = msg->msg_namelen;
-        struct sockaddr_dn *addr = (struct sockaddr_dn *)msg->msg_name;
+        DECLARE_SOCKADDR(struct sockaddr_dn *, addr, msg->msg_name);
         struct sk_buff *skb = NULL;
         struct dn_skb_cb *cb;
         size_t len;
@@ -2103,8 +2104,6 @@ static struct notifier_block dn_dev_notifier = {
         .notifier_call = dn_device_event,
 };
 
-extern int dn_route_rcv(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
-
 static struct packet_type dn_dix_packet_type __read_mostly = {
         .type =         cpu_to_be16(ETH_P_DNA_RT),
         .func =         dn_route_rcv,
@@ -2352,9 +2351,6 @@ static const struct proto_ops dn_proto_ops = {
         .sendpage =     sock_no_sendpage,
 };
 
-void dn_register_sysctl(void);
-void dn_unregister_sysctl(void);
-
 MODULE_DESCRIPTION("The Linux DECnet Network Protocol");
 MODULE_AUTHOR("Linux DECnet Project Team");
 MODULE_LICENSE("GPL");