Commit c52fd4f0 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Jakub Kicinski
Browse files

net: remove '__' from __skb_flow_get_ports() 



Only one version of skb_flow_get_ports() exists after the previous commit,
so let's remove the useless '__'.

Suggested-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Link: https://patch.msgid.link/20250221110941.2041629-3-nicolas.dichtel@6wind.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 89ac4a59

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4214,7 +4214,7 @@ static bool bond_flow_ip(struct sk_buff *skb, struct flow_keys *fk, const void * 
	}



	if (l34 && *ip_proto >= 0)

		fk->ports.ports = __skb_flow_get_ports(skb, *nhoff, *ip_proto, data, hlen);

		fk->ports.ports = skb_flow_get_ports(skb, *nhoff, *ip_proto, data, hlen);



	return true;

}

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -1533,7 +1533,7 @@ void __skb_get_hash_net(const struct net *net, struct sk_buff *skb); 
u32 skb_get_poff(const struct sk_buff *skb);

u32 __skb_get_poff(const struct sk_buff *skb, const void *data,

		   const struct flow_keys_basic *keys, int hlen);

__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,

__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,

			  const void *data, int hlen_proto);



void skb_flow_dissector_init(struct flow_dissector *flow_dissector,

net/core/flow_dissector.c

+5 −5
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int flow_dissector_bpf_prog_attach_check(struct net *net, 
#endif /* CONFIG_BPF_SYSCALL */



/**

 * __skb_flow_get_ports - extract the upper layer ports and return them

 * skb_flow_get_ports - extract the upper layer ports and return them

 * @skb: sk_buff to extract the ports from

 * @thoff: transport header offset

 * @ip_proto: protocol for which to get port offset
@@ -116,7 +116,7 @@ int flow_dissector_bpf_prog_attach_check(struct net *net, 
 * The function will try to retrieve the ports at offset thoff + poff where poff

 * is the protocol port offset returned from proto_ports_offset

 */

__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,

__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,

			  const void *data, int hlen)

{

	int poff = proto_ports_offset(ip_proto);
@@ -137,7 +137,7 @@ __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto, 


	return 0;

}

EXPORT_SYMBOL(__skb_flow_get_ports);

EXPORT_SYMBOL(skb_flow_get_ports);



static bool icmp_has_id(u8 type)

{
@@ -870,7 +870,7 @@ __skb_flow_dissect_ports(const struct sk_buff *skb, 
	if (!key_ports && !key_ports_range)

		return;



	ports = __skb_flow_get_ports(skb, nhoff, ip_proto, data, hlen);

	ports = skb_flow_get_ports(skb, nhoff, ip_proto, data, hlen);



	if (key_ports)

		key_ports->ports = ports;