Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82f9e2d5 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-af-xdp-cleanups' 



Björn Töpel says:

====================
This series contain "cosmetics only" follow-up patches for AF_XDP.

Thanks to Daniel for suggesting them!
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents a7862293 c2f4374b

include/net/xdp_sock.h

+2 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0

 * AF_XDP internal functions

/* SPDX-License-Identifier: GPL-2.0 */

/* AF_XDP internal functions

 * Copyright(c) 2018 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#ifndef _LINUX_XDP_SOCK_H

include/uapi/linux/if_xdp.h

+2 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note

 *

/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * if_xdp: XDP socket user-space interface

 * Copyright(c) 2018 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * Author(s): Björn Töpel <bjorn.topel@intel.com>

 *	      Magnus Karlsson <magnus.karlsson@intel.com>

 */

kernel/bpf/xskmap.c

+0 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* XSKMAP used for AF_XDP sockets

 * Copyright(c) 2018 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#include <linux/bpf.h>

net/xdp/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_XDP_SOCKETS) += xsk.o xdp_umem.o xsk_queue.o

net/xdp/xdp_umem.c

+2 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* XDP user-space packet buffer

 * Copyright(c) 2018 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#include <linux/init.h>
@@ -29,7 +20,7 @@ int xdp_umem_create(struct xdp_umem **umem) 
{

	*umem = kzalloc(sizeof(**umem), GFP_KERNEL);



	if (!(*umem))

	if (!*umem)

		return -ENOMEM;



	return 0;
@@ -256,5 +247,5 @@ int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) 


bool xdp_umem_validate_queues(struct xdp_umem *umem)

{

	return (umem->fq && umem->cq);

	return umem->fq && umem->cq;

}