Re: [PATCH 2/2] ip_tunnel: add mpls over gre encapsulation

[Amine Kherbouche <amine.kherbouche@6wind.com>]

Hi Francois,

Thanks for the feedback, I'll make it for the next version.

On 21/09/2017 23:25, Francois Romieu wrote:
> Amine Kherbouche <amine.kherbouche@6wind.com> :
> [...]
>> diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
>> index 36ea2ad..060ed07 100644
>> --- a/net/mpls/af_mpls.c
>> +++ b/net/mpls/af_mpls.c
> [...]
>> @@ -39,6 +40,40 @@ static int one = 1;
>>   static int label_limit = (1 << 20) - 1;
>>   static int ttl_max = 255;
>>   
>> +size_t ipgre_mpls_encap_hlen(struct ip_tunnel_encap *e)
>> +{
>> +	return sizeof(struct mpls_shim_hdr);
>> +}
>> +
>> +int ipgre_mpls_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,
>> +			    u8 *protocol, struct flowi4 *fl4)
>> +{
>> +	return 0;
>> +}
>> +
>> +static const struct ip_tunnel_encap_ops mpls_iptun_ops = {
>> +	.encap_hlen = ipgre_mpls_encap_hlen,
>> +	.build_header = ipgre_mpls_build_header,
>> +};
> Nit: af_mpls.c uses tab before '=' in such places.
>
>> +
>> +int ipgre_tunnel_encap_add_mpls_ops(void)
>> +{
>> +	int ret;
>> +
>> +	ret = ip_tunnel_encap_add_ops(&mpls_iptun_ops, TUNNEL_ENCAP_MPLS);
> ip_tunnel_encap_add_ops is CONFIG_NET_IP_TUNNEL dependant.
>
> Afaics CONFIG_MPLS does not enforce it.
>
> [...]
>> @@ -2486,6 +2521,7 @@ static int __init mpls_init(void)
>>   		      0);
>>   	rtnl_register(PF_MPLS, RTM_GETNETCONF, mpls_netconf_get_devconf,
>>   		      mpls_netconf_dump_devconf, 0);
>> +	ipgre_tunnel_encap_add_mpls_ops();
>>   	err = 0;
>>   out:
>>   	return err;
> ipgre_tunnel_encap_add_mpls_ops status return code is not checked.
>