[ remove other unrelated dev groups ]
Hi pablo,
2016-09-29 9:20 GMT+08:00 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>:
> Hi all,
>
> On Tue, 13 Sep 2016 10:12:50 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>>
>> Today's linux-next merge of the netfilter-next tree got a conflict in:
>>
>> net/netfilter/nf_tables_netdev.c
>>
>> between commit:
>>
>> c73c24849011 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
>>
>> from the net tree and commit:
>>
>> ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()")
>>
>> include/net/netfilter/nf_tables_ipv4.h | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h
>> index 968f00b82fb5..25e33aee91e7 100644
>> --- a/include/net/netfilter/nf_tables_ipv4.h
>> +++ b/include/net/netfilter/nf_tables_ipv4.h
>> @@ -33,7 +33,6 @@ __nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
>> if (!iph)
>> return -1;
>>
>> - iph = ip_hdr(skb);
>> if (iph->ihl < 5 || iph->version != 4)
>> return -1;
>>
>> --
>> 2.8.1
>
> The above merge fix patch is now needed when the net-next tree is
> merged with Linus' tree.
>
I think this merge conflict was fixed in your nf-next tree by
commit f20fbc0717f9.
But this redundant statement "iph = ip_hdr(skb);" should be
removed, we already use skb_header_pointer to get ip header
pointer before.
See function __nft_set_pktinfo_ipv4_validate():
{
struct iphdr *iph, _iph;
u32 len, thoff;
iph = skb_header_pointer(skb, ....);
^^^^^^^^^^^^^^^^^^^^^^^^^
if (!iph)
return -1;
iph = ip_hdr(skb);
^^^^^^^^^^^^^^^^^
if (iph->ihl < 5 || iph->version != 4)
....
> --
> Cheers,
> Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
