--- zzzz-none-000/linux-2.6.19.2/net/core/sock.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/net/core/sock.c	2007-01-19 14:42:56.000000000 +0000
@@ -804,7 +804,7 @@
  *
  * (We also register the sk_lock with the lock validator.)
  */
-static void inline sock_lock_init(struct sock *sk)
+static inline void sock_lock_init(struct sock *sk)
 {
 	spin_lock_init(&sk->sk_lock.slock);
 	sk->sk_lock.owner = NULL;
@@ -1160,7 +1160,7 @@
 			goto failure;
 
 		if (atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf) {
-			skb = alloc_skb(header_len, gfp_mask);
+			skb = alloc_skb(header_len, sk->sk_allocation);
 			if (skb) {
 				int npages;
 				int i;