Subject: Re: [PATCH 1/2] udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMS

From: Philip Craig <[email-masked]>
Date: Mon, 03 Nov 2008 11:46:38 +1000

David Miller wrote:
> From: Wei Yongjun <[email-masked]>
> Date: Sat, 01 Nov 2008 17:08:55 +0800
> 
>> @@ -158,6 +159,8 @@ try_again:
>>  	else if (copied < ulen)
>>  		msg->msg_flags |= MSG_TRUNC;
>>  +	is_udp4 = (skb->protocol == htons(ETH_P_IP));
>> +
>>  	/*
>>  	 * If checksum is needed at all, try to do it while copying the
>>  	 * data.  If the data is truncated, or if we only want a partial
>  ...
>>  	sock_recv_timestamp(msg, sk, skb);
>>  @@ -196,7 +204,7 @@ try_again:
>>  		sin6->sin6_flowinfo = 0;
>>  		sin6->sin6_scope_id = 0;
>>  -		if (skb->protocol == htons(ETH_P_IP))
>> +		if (is_udp4)
>>  			ipv6_addr_set(&sin6->sin6_addr, 0, 0,
> 
> This patch is corrupted in ways I thought I would never see in my
> entire life.  Congratulations!

The patch looked okay to me, but judging by the bits you quoted,
the format=flowed is causing the problem.