Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-remove-skb_flow_get_ports'
Nicolas Dichtel says:
====================
net: remove skb_flow_get_ports()
Remove skb_flow_get_ports() and rename __skb_flow_get_ports() to
skb_flow_get_ports().
====================
Link: https://patch.msgid.link/20250221110941.2041629-1-nicolas.dichtel@6wind.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+8
-14
+1
-1
drivers/net/bonding/bond_main.c
+1
-1
drivers/net/bonding/bond_main.c
+2
-8
include/linux/skbuff.h
+2
-8
include/linux/skbuff.h
···
1533
1533
u32 skb_get_poff(const struct sk_buff *skb);
1534
1534
u32 __skb_get_poff(const struct sk_buff *skb, const void *data,
1535
1535
const struct flow_keys_basic *keys, int hlen);
1536
-
__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
1537
-
const void *data, int hlen_proto);
1538
-
1539
-
static inline __be32 skb_flow_get_ports(const struct sk_buff *skb,
1540
-
int thoff, u8 ip_proto)
1541
-
{
1542
-
return __skb_flow_get_ports(skb, thoff, ip_proto, NULL, 0);
1543
-
}
1536
+
__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
1537
+
const void *data, int hlen_proto);
1544
1538
1545
1539
void skb_flow_dissector_init(struct flow_dissector *flow_dissector,
1546
1540
const struct flow_dissector_key *key,
+5
-5
net/core/flow_dissector.c
+5
-5
net/core/flow_dissector.c
···
106
106
#endif /* CONFIG_BPF_SYSCALL */
107
107
108
108
/**
109
-
* __skb_flow_get_ports - extract the upper layer ports and return them
109
+
* skb_flow_get_ports - extract the upper layer ports and return them
110
110
* @skb: sk_buff to extract the ports from
111
111
* @thoff: transport header offset
112
112
* @ip_proto: protocol for which to get port offset
···
116
116
* The function will try to retrieve the ports at offset thoff + poff where poff
117
117
* is the protocol port offset returned from proto_ports_offset
118
118
*/
119
-
__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
120
-
const void *data, int hlen)
119
+
__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
120
+
const void *data, int hlen)
121
121
{
122
122
int poff = proto_ports_offset(ip_proto);
123
123
···
137
137
138
138
return 0;
139
139
}
140
-
EXPORT_SYMBOL(__skb_flow_get_ports);
140
+
EXPORT_SYMBOL(skb_flow_get_ports);
141
141
142
142
static bool icmp_has_id(u8 type)
143
143
{
···
870
870
if (!key_ports && !key_ports_range)
871
871
return;
872
872
873
-
ports = __skb_flow_get_ports(skb, nhoff, ip_proto, data, hlen);
873
+
ports = skb_flow_get_ports(skb, nhoff, ip_proto, data, hlen);
874
874
875
875
if (key_ports)
876
876
key_ports->ports = ports;