3 files changed, 5 insertions, 6 deletions

diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 8b98d53d9976..d9aebbc510cc 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1371,7 +1371,7 @@ isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev)
         eth = eth_hdr(skb);
 
         if (*eth->h_dest & 1) {
-                if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
+                if (ether_addr_equal(eth->h_dest, dev->broadcast))
                         skb->pkt_type = PACKET_BROADCAST;
                 else
                         skb->pkt_type = PACKET_MULTICAST;
@@ -1382,7 +1382,7 @@ isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev)
          */
 
         else if (dev->flags & (IFF_PROMISC /*| IFF_ALLMULTI*/)) {
-                if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN))
+                if (!ether_addr_equal(eth->h_dest, dev->dev_addr))
                         skb->pkt_type = PACKET_OTHERHOST;
         }
         if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 5cefb479c707..1be82284cf9d 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -135,7 +135,7 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                 return err;
 
         if (msg->msg_name) {
-                struct sockaddr_mISDN *maddr = msg->msg_name;
+                DECLARE_SOCKADDR(struct sockaddr_mISDN *, maddr, msg->msg_name);
 
                 maddr->family = AF_ISDN;
                 maddr->dev = _pms(sk)->dev->id;
@@ -179,7 +179,6 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
         struct sock             *sk = sock->sk;
         struct sk_buff          *skb;
         int                     err = -ENOMEM;
-        struct sockaddr_mISDN   *maddr;
 
         if (*debug & DEBUG_SOCKET)
                 printk(KERN_DEBUG "%s: len %d flags %x ch %d proto %x\n",
@@ -214,7 +213,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 
         if (msg->msg_namelen >= sizeof(struct sockaddr_mISDN)) {
                 /* if we have a address, we use it */
-                maddr = (struct sockaddr_mISDN *)msg->msg_name;
+                DECLARE_SOCKADDR(struct sockaddr_mISDN *, maddr, msg->msg_name);
                 mISDN_HEAD_ID(skb) = maddr->channel;
         } else { /* use default for L2 messages */
                 if ((sk->sk_protocol == ISDN_P_LAPD_TE) ||
diff --git a/drivers/isdn/sc/event.c b/drivers/isdn/sc/event.c
index 717003a3bdf4..833d96c2cf92 100644
--- a/drivers/isdn/sc/event.c
+++ b/drivers/isdn/sc/event.c
@@ -57,7 +57,7 @@ int indicate_status(int card, int event, ulong Channel, char *Data)
                         memcpy(&cmd.parm.setup, Data, sizeof(cmd.parm.setup));
                         break;
                 default:
-                        strcpy(cmd.parm.num, Data);
+                        strlcpy(cmd.parm.num, Data, sizeof(cmd.parm.num));
                 }
         }