projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[cascardo/linux.git]
/
net
/
decnet
/
dn_nsp_out.c
diff --git
a/net/decnet/dn_nsp_out.c
b/net/decnet/dn_nsp_out.c
index
564a6ad
..
8a96047
100644
(file)
--- a/
net/decnet/dn_nsp_out.c
+++ b/
net/decnet/dn_nsp_out.c
@@
-322,7
+322,7
@@
static __le16 *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, unsigned c
/* Set "cross subchannel" bit in ackcrs */
ackcrs |= 0x2000;
- ptr =
(__le16 *)
dn_mk_common_header(scp, skb, msgflag, hlen);
+ ptr = dn_mk_common_header(scp, skb, msgflag, hlen);
*ptr++ = cpu_to_le16(acknum);
*ptr++ = cpu_to_le16(ackcrs);