commit f2f167583601 ("xsk: Remove unused xsk_buff_discard")
left behind this, remove it.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 include/net/xdp_sock_drv.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
index 9c0d860609ba..c243f906ebed 100644
--- a/include/net/xdp_sock_drv.h
+++ b/include/net/xdp_sock_drv.h
@@ -255,10 +255,6 @@ static inline void xsk_buff_free(struct xdp_buff *xdp)
 {
 }
 
-static inline void xsk_buff_discard(struct xdp_buff *xdp)
-{
-}
-
 static inline void xsk_buff_set_size(struct xdp_buff *xdp, u32 size)
 {
 }
-- 
2.34.1

On Thu, Jun 15, 2023 at 08:46:12PM +0800, YueHaibing wrote:
> commit f2f167583601 ("xsk: Remove unused xsk_buff_discard")
> left behind this, remove it.
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Yeah this is a stub for !CONFIG_XDP_SOCKETS...

Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>

> ---
>  include/net/xdp_sock_drv.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
> index 9c0d860609ba..c243f906ebed 100644
> --- a/include/net/xdp_sock_drv.h
> +++ b/include/net/xdp_sock_drv.h
> @@ -255,10 +255,6 @@ static inline void xsk_buff_free(struct xdp_buff *xdp)
>  {
>  }
>  
> -static inline void xsk_buff_discard(struct xdp_buff *xdp)
> -{
> -}
> -
>  static inline void xsk_buff_set_size(struct xdp_buff *xdp, u32 size)
>  {
>  }
> -- 
> 2.34.1
> 
>

On Thu, Jun 15, 2023 at 03:49:23PM +0200, Maciej Fijalkowski wrote:
> On Thu, Jun 15, 2023 at 08:46:12PM +0800, YueHaibing wrote:
> > commit f2f167583601 ("xsk: Remove unused xsk_buff_discard")
> > left behind this, remove it.
> > 
> > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> 
> Yeah this is a stub for !CONFIG_XDP_SOCKETS...

Wait, I am not sure if this should go to bpf tree and have fixes tag
pointing to the cited commit?

Functionally this commit does not fix anything but it feels that
f2f167583601 was incomplete.

> 
> Acked-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
> 
> > ---
> >  include/net/xdp_sock_drv.h | 4 ----
> >  1 file changed, 4 deletions(-)
> > 
> > diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
> > index 9c0d860609ba..c243f906ebed 100644
> > --- a/include/net/xdp_sock_drv.h
> > +++ b/include/net/xdp_sock_drv.h
> > @@ -255,10 +255,6 @@ static inline void xsk_buff_free(struct xdp_buff *xdp)
> >  {
> >  }
> >  
> > -static inline void xsk_buff_discard(struct xdp_buff *xdp)
> > -{
> > -}
> > -
> >  static inline void xsk_buff_set_size(struct xdp_buff *xdp, u32 size)
> >  {
> >  }
> > -- 
> > 2.34.1
> > 
> >

On Thu, Jun 15, 2023 at 03:51:49PM +0200, Maciej Fijalkowski wrote:
> On Thu, Jun 15, 2023 at 03:49:23PM +0200, Maciej Fijalkowski wrote:
> > On Thu, Jun 15, 2023 at 08:46:12PM +0800, YueHaibing wrote:
> > > commit f2f167583601 ("xsk: Remove unused xsk_buff_discard")
> > > left behind this, remove it.
> > > 
> > > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> > 
> > Yeah this is a stub for !CONFIG_XDP_SOCKETS...
> 
> Wait, I am not sure if this should go to bpf tree and have fixes tag
> pointing to the cited commit?
> 
> Functionally this commit does not fix anything but it feels that
> f2f167583601 was incomplete.

FWIIW, I think that bpf-next is appropriate for this patch
as it doesn't address a bug.

On 2023/6/15 22:40, Simon Horman wrote:
> On Thu, Jun 15, 2023 at 03:51:49PM +0200, Maciej Fijalkowski wrote:
>> On Thu, Jun 15, 2023 at 03:49:23PM +0200, Maciej Fijalkowski wrote:
>>> On Thu, Jun 15, 2023 at 08:46:12PM +0800, YueHaibing wrote:
>>>> commit f2f167583601 ("xsk: Remove unused xsk_buff_discard")
>>>> left behind this, remove it.
>>>>
>>>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>>>
>>> Yeah this is a stub for !CONFIG_XDP_SOCKETS...
>>
>> Wait, I am not sure if this should go to bpf tree and have fixes tag
>> pointing to the cited commit?
>>
>> Functionally this commit does not fix anything but it feels that
>> f2f167583601 was incomplete.
> 
> FWIIW, I think that bpf-next is appropriate for this patch
> as it doesn't address a bug.

Ok , will send v2 target to bpf-next.
> .
>