* [PATCH net-next] net: fix compile error of implicit declaration of skb_probe_transport_header
@ 2013-03-28 2:46 Ying Xue
2013-03-28 3:12 ` Jason Wang
0 siblings, 1 reply; 3+ messages in thread
From: Ying Xue @ 2013-03-28 2:46 UTC (permalink / raw)
To: netdev; +Cc: davem, jasowang, edumazet
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 <jasowang@redhat.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Ying Xue <ying.xue@windriver.com>
---
include/linux/skbuff.h | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index fa88b96..878e0ee 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1560,19 +1560,6 @@ static inline void skb_set_transport_header(struct sk_buff *skb,
skb->transport_header += offset;
}
-static inline void skb_probe_transport_header(struct sk_buff *skb,
- const int offset_hint)
-{
- struct flow_keys keys;
-
- if (skb_transport_header_was_set(skb))
- return;
- else if (skb_flow_dissect(skb, &keys))
- skb_set_transport_header(skb, keys.thoff);
- else
- skb_set_transport_header(skb, offset_hint);
-}
-
static inline unsigned char *skb_network_header(const struct sk_buff *skb)
{
return skb->head + skb->network_header;
@@ -1716,6 +1703,19 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
}
#endif /* NET_SKBUFF_DATA_USES_OFFSET */
+static inline void skb_probe_transport_header(struct sk_buff *skb,
+ const int offset_hint)
+{
+ struct flow_keys keys;
+
+ if (skb_transport_header_was_set(skb))
+ return;
+ else if (skb_flow_dissect(skb, &keys))
+ skb_set_transport_header(skb, keys.thoff);
+ else
+ skb_set_transport_header(skb, offset_hint);
+}
+
static inline void skb_mac_header_rebuild(struct sk_buff *skb)
{
if (skb_mac_header_was_set(skb)) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: fix compile error of implicit declaration of skb_probe_transport_header
2013-03-28 2:46 [PATCH net-next] net: fix compile error of implicit declaration of skb_probe_transport_header Ying Xue
@ 2013-03-28 3:12 ` Jason Wang
2013-03-28 3:22 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jason Wang @ 2013-03-28 3:12 UTC (permalink / raw)
To: Ying Xue; +Cc: netdev, davem, edumazet
On 03/28/2013 10:46 AM, Ying Xue wrote:
> 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 <jasowang@redhat.com>
> Cc: Eric Dumazet <edumazet@google.com>
> Signed-off-by: Ying Xue <ying.xue@windriver.com>
> ---
> include/linux/skbuff.h | 26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
Oops.
Acked-by: Jason Wang <jasowang@redhat.com>
Thanks
>
> diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
> index fa88b96..878e0ee 100644
> --- a/include/linux/skbuff.h
> +++ b/include/linux/skbuff.h
> @@ -1560,19 +1560,6 @@ static inline void skb_set_transport_header(struct sk_buff *skb,
> skb->transport_header += offset;
> }
>
> -static inline void skb_probe_transport_header(struct sk_buff *skb,
> - const int offset_hint)
> -{
> - struct flow_keys keys;
> -
> - if (skb_transport_header_was_set(skb))
> - return;
> - else if (skb_flow_dissect(skb, &keys))
> - skb_set_transport_header(skb, keys.thoff);
> - else
> - skb_set_transport_header(skb, offset_hint);
> -}
> -
> static inline unsigned char *skb_network_header(const struct sk_buff *skb)
> {
> return skb->head + skb->network_header;
> @@ -1716,6 +1703,19 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
> }
> #endif /* NET_SKBUFF_DATA_USES_OFFSET */
>
> +static inline void skb_probe_transport_header(struct sk_buff *skb,
> + const int offset_hint)
> +{
> + struct flow_keys keys;
> +
> + if (skb_transport_header_was_set(skb))
> + return;
> + else if (skb_flow_dissect(skb, &keys))
> + skb_set_transport_header(skb, keys.thoff);
> + else
> + skb_set_transport_header(skb, offset_hint);
> +}
> +
> static inline void skb_mac_header_rebuild(struct sk_buff *skb)
> {
> if (skb_mac_header_was_set(skb)) {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: fix compile error of implicit declaration of skb_probe_transport_header
2013-03-28 3:12 ` Jason Wang
@ 2013-03-28 3:22 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-03-28 3:22 UTC (permalink / raw)
To: jasowang; +Cc: ying.xue, netdev, edumazet
From: Jason Wang <jasowang@redhat.com>
Date: Thu, 28 Mar 2013 11:12:06 +0800
> On 03/28/2013 10:46 AM, Ying Xue wrote:
>> 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 <jasowang@redhat.com>
>> Cc: Eric Dumazet <edumazet@google.com>
>> Signed-off-by: Ying Xue <ying.xue@windriver.com>
>> ---
>> include/linux/skbuff.h | 26 +++++++++++++-------------
>> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> Oops.
>
> Acked-by: Jason Wang <jasowang@redhat.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-28 3:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-28 2:46 [PATCH net-next] net: fix compile error of implicit declaration of skb_probe_transport_header Ying Xue
2013-03-28 3:12 ` Jason Wang
2013-03-28 3:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).