--- zzzz-none-000/linux-2.6.19.2/net/netfilter/nfnetlink_queue.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/net/netfilter/nfnetlink_queue.c	2007-01-11 07:38:19.000000000 +0000
@@ -414,7 +414,7 @@
 	nfmsg->res_id = htons(queue->queue_num);
 
 	pmsg.packet_id 		= htonl(entry->id);
-	pmsg.hw_protocol	= entskb->protocol;
+	pmsg.hw_protocol	= htons(entskb->protocol);
 	pmsg.hook		= entinf->hook;
 
 	NFA_PUT(skb, NFQA_PACKET_HDR, sizeof(pmsg), &pmsg);
@@ -622,10 +622,9 @@
 	int diff;
 
 	diff = data_len - e->skb->len;
-	if (diff < 0) {
-		if (pskb_trim(e->skb, data_len))
-			return -ENOMEM;
-	} else if (diff > 0) {
+	if (diff < 0)
+		skb_trim(e->skb, data_len);
+	else if (diff > 0) {
 		if (data_len > 0xFFFF)
 			return -EINVAL;
 		if (diff > skb_tailroom(e->skb)) {