diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-05 19:10:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-05 19:10:04 -0800 |
| commit | d1ed6a3ea10aa7b199c434f6ffd1b6761896567a (patch) | |
| tree | ad65f11ace691a630885607604e1da0aa16db820 /net/core/sock.c | |
| parent | 59359ff87700f5e742c96a55da9cf0819984c128 (diff) | |
| parent | 38c94377a36f70e86665231c9f477e445c806618 (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:
[NETLABEL]: Fix build failure.
[IPV6]: Give sit driver an appropriate module alias.
[IPV6]: Add ndisc_netdev_notifier unregister.
[NET]: __alloc_pages() failures reported due to fragmentation
[PKTGEN]: TCI endianness fixes
[TG3]: Fix 2nd ifup failure on 5752M.
[NETFILTER] bug: skb->protocol is already net-endian
[NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit
[NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit
[IPV6]: Fix ECN bug on big-endian
[IPX]: Annotate and fix IPX checksum
[IPX]: Trivial parts of endianness annotations
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index d472db4776c3..ee6cd2541d35 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1160,7 +1160,7 @@ static struct sk_buff *sock_alloc_send_pskb(struct sock *sk, goto failure; if (atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf) { - skb = alloc_skb(header_len, sk->sk_allocation); + skb = alloc_skb(header_len, gfp_mask); if (skb) { int npages; int i; |