Skip to content

Commit fbbdb8f

Browse files
ying-xuedavem330
authored andcommitted
net: fix compile error of implicit declaration of skb_probe_transport_header
The commit 40893fd(net: switch to use skb_probe_transport_header()) involes a new error accidently. When NET_SKBUFF_DATA_USES_OFFSE is not enabled, below compile error happens: CC net/packet/af_packet.o net/packet/af_packet.c: In function ‘packet_sendmsg_spkt’: net/packet/af_packet.c:1516:2: error: implicit declaration of function ‘skb_probe_transport_header’ [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[2]: *** [net/packet/af_packet.o] Error 1 make[1]: *** [net/packet] Error 2 make: *** [net] Error 2 As it seems skb_probe_transport_header() is not related to NET_SKBUFF_DATA_USES_OFFSE, we should move the definition of skb_probe_transport_header() out of scope of NET_SKBUFF_DATA_USES_OFFSE macro. Cc: Jason Wang <[email protected]> Cc: Eric Dumazet <[email protected]> Signed-off-by: Ying Xue <[email protected]> Acked-by: Jason Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 429a22c commit fbbdb8f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

include/linux/skbuff.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,19 +1560,6 @@ static inline void skb_set_transport_header(struct sk_buff *skb,
15601560
skb->transport_header += offset;
15611561
}
15621562

1563-
static inline void skb_probe_transport_header(struct sk_buff *skb,
1564-
const int offset_hint)
1565-
{
1566-
struct flow_keys keys;
1567-
1568-
if (skb_transport_header_was_set(skb))
1569-
return;
1570-
else if (skb_flow_dissect(skb, &keys))
1571-
skb_set_transport_header(skb, keys.thoff);
1572-
else
1573-
skb_set_transport_header(skb, offset_hint);
1574-
}
1575-
15761563
static inline unsigned char *skb_network_header(const struct sk_buff *skb)
15771564
{
15781565
return skb->head + skb->network_header;
@@ -1716,6 +1703,19 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
17161703
}
17171704
#endif /* NET_SKBUFF_DATA_USES_OFFSET */
17181705

1706+
static inline void skb_probe_transport_header(struct sk_buff *skb,
1707+
const int offset_hint)
1708+
{
1709+
struct flow_keys keys;
1710+
1711+
if (skb_transport_header_was_set(skb))
1712+
return;
1713+
else if (skb_flow_dissect(skb, &keys))
1714+
skb_set_transport_header(skb, keys.thoff);
1715+
else
1716+
skb_set_transport_header(skb, offset_hint);
1717+
}
1718+
17191719
static inline void skb_mac_header_rebuild(struct sk_buff *skb)
17201720
{
17211721
if (skb_mac_header_was_set(skb)) {

0 commit comments

Comments
 (0)