diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-08 07:34:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-08 07:34:11 -0800 |
| commit | 3ee783a3e4867ce5691bfa6a818959e88a50f209 (patch) | |
| tree | 4263289a5f8551500c0c66bbb0c7ab01a4e8e075 /net/decnet/dn_nsp_out.c | |
| parent | 80c218812786f619c9a1ce50d0e7c32c7afde4de (diff) | |
| parent | 375d9d71838970030c8e0bf0ac2abcc1a3487df8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DECNET]: Endianess fixes (try #2)
[TG3]: Fix array overrun in tg3_read_partno().
[NET]: Set truesize in pskb_copy
[NETPOLL]: Compute checksum properly in netpoll_send_udp().
[PKT_SCHED] sch_htb: Use hlist_del_init().
[TCP]: Don't use highmem in tcp hash size calculation.
[NET]: kconfig, correct traffic shaper
Diffstat (limited to 'net/decnet/dn_nsp_out.c')
| -rw-r--r-- | net/decnet/dn_nsp_out.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c index c2e21cd89b3..b342e4e8f5f 100644 --- a/net/decnet/dn_nsp_out.c +++ b/net/decnet/dn_nsp_out.c @@ -526,7 +526,7 @@ void dn_send_conn_conf(struct sock *sk, gfp_t gfp) struct nsp_conn_init_msg *msg; __u8 len = (__u8)dn_ntohs(scp->conndata_out.opt_optl); - if ((skb = dn_alloc_skb(sk, 50 + dn_ntohs(scp->conndata_out.opt_optl), gfp)) == NULL) + if ((skb = dn_alloc_skb(sk, 50 + len, gfp)) == NULL) return; msg = (struct nsp_conn_init_msg *)skb_put(skb, sizeof(*msg)); |