public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 00:34:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: remove '__' from __skb_flow_get_ports()

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

Suggested-by: Simon Horman <horms@kernel.org>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Link: https://patch.msgid.link/20250221110941.2041629-3-nicolas.dichtel@6wind.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Nicolas Dichtel 2025-02-21 12:07:29 +01:00 • committed by Jakub Kicinski
parent 89ac4a59ca
commit c52fd4f083
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/bonding/bond_main.c
View file

@ -4214,7 +4214,7 @@ static bool bond_flow_ip(struct sk_buff *skb, struct flow_keys *fk, const void *
} }
if (l34 && *ip_proto >= 0) 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; return true;
} }

4
include/linux/skbuff.h
View file

@ -1533,8 +1533,8 @@ 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);
u32 __skb_get_poff(const struct sk_buff *skb, const void *data, u32 __skb_get_poff(const struct sk_buff *skb, const void *data,
const struct flow_keys_basic *keys, int hlen); 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); const void *data, int hlen_proto);
void skb_flow_dissector_init(struct flow_dissector *flow_dissector, void skb_flow_dissector_init(struct flow_dissector *flow_dissector,
const struct flow_dissector_key *key, const struct flow_dissector_key *key,

10
net/core/flow_dissector.c
View file

@ -106,7 +106,7 @@ int flow_dissector_bpf_prog_attach_check(struct net *net,
#endif /* CONFIG_BPF_SYSCALL */ #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 * @skb: sk_buff to extract the ports from
* @thoff: transport header offset * @thoff: transport header offset
* @ip_proto: protocol for which to get port offset * @ip_proto: protocol for which to get port offset
@ -116,8 +116,8 @@ int flow_dissector_bpf_prog_attach_check(struct net *net,
* The function will try to retrieve the ports at offset thoff + poff where poff * The function will try to retrieve the ports at offset thoff + poff where poff
* is the protocol port offset returned from proto_ports_offset * 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) const void *data, int hlen)
{ {
int poff = proto_ports_offset(ip_proto); 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; return 0;
} }
EXPORT_SYMBOL(__skb_flow_get_ports); EXPORT_SYMBOL(skb_flow_get_ports);
static bool icmp_has_id(u8 type) 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) if (!key_ports && !key_ports_range)
return; 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) if (key_ports)
key_ports->ports = ports; key_ports->ports = ports;