aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/mISDN/socket.c5
1 files changed, 2 insertions, 3 deletions
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,
135 return err; 135 return err;
136 136
137 if (msg->msg_name) { 137 if (msg->msg_name) {
138 struct sockaddr_mISDN *maddr = msg->msg_name; 138 DECLARE_SOCKADDR(struct sockaddr_mISDN *, maddr, msg->msg_name);
139 139
140 maddr->family = AF_ISDN; 140 maddr->family = AF_ISDN;
141 maddr->dev = _pms(sk)->dev->id; 141 maddr->dev = _pms(sk)->dev->id;
@@ -179,7 +179,6 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
179 struct sock *sk = sock->sk; 179 struct sock *sk = sock->sk;
180 struct sk_buff *skb; 180 struct sk_buff *skb;
181 int err = -ENOMEM; 181 int err = -ENOMEM;
182 struct sockaddr_mISDN *maddr;
183 182
184 if (*debug & DEBUG_SOCKET) 183 if (*debug & DEBUG_SOCKET)
185 printk(KERN_DEBUG "%s: len %d flags %x ch %d proto %x\n", 184 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,
214 213
215 if (msg->msg_namelen >= sizeof(struct sockaddr_mISDN)) { 214 if (msg->msg_namelen >= sizeof(struct sockaddr_mISDN)) {
216 /* if we have a address, we use it */ 215 /* if we have a address, we use it */
217 maddr = (struct sockaddr_mISDN *)msg->msg_name; 216 DECLARE_SOCKADDR(struct sockaddr_mISDN *, maddr, msg->msg_name);
218 mISDN_HEAD_ID(skb) = maddr->channel; 217 mISDN_HEAD_ID(skb) = maddr->channel;
219 } else { /* use default for L2 messages */ 218 } else { /* use default for L2 messages */
220 if ((sk->sk_protocol == ISDN_P_LAPD_TE) || 219 if ((sk->sk_protocol == ISDN_P_LAPD_TE) ||