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

Commit fec149f5 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by David S. Miller
Browse files

batman-adv: Convert packet.h to uapi header 



The header file is used by different userspace programs to inject packets
or to decode sniffed packets. It should therefore be available to them as
userspace header.

Also other components in the kernel (like the flow dissector) require
access to the packet definitions to be able to decode ETH_P_BATMAN ethernet
packets.

Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@openmesh.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent adbf9b73

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2564,6 +2564,7 @@ S: Maintained 
F:	Documentation/ABI/testing/sysfs-class-net-batman-adv

F:	Documentation/ABI/testing/sysfs-class-net-mesh

F:	Documentation/networking/batman-adv.rst

F:	include/uapi/linux/batadv_packet.h

F:	include/uapi/linux/batman_adv.h

F:	net/batman-adv/

net/batman-adv/packet.h→include/uapi/linux/batadv_packet.h

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

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

/* Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich
@@ -16,8 +16,8 @@ 
 * along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef _NET_BATMAN_ADV_PACKET_H_

#define _NET_BATMAN_ADV_PACKET_H_

#ifndef _UAPI_LINUX_BATADV_PACKET_H_

#define _UAPI_LINUX_BATADV_PACKET_H_



#include <asm/byteorder.h>

#include <linux/if_ether.h>
@@ -641,4 +641,4 @@ struct batadv_tvlv_mcast_data { 
	__u8 reserved[3];

};



#endif /* _NET_BATMAN_ADV_PACKET_H_ */
 
#endif /* _UAPI_LINUX_BATADV_PACKET_H_ */

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/workqueue.h>

#include <net/genetlink.h>

#include <net/netlink.h>

#include <uapi/linux/batadv_packet.h>

#include <uapi/linux/batman_adv.h>



#include "bat_algo.h"
@@ -63,7 +64,6 @@ 
#include "netlink.h"

#include "network-coding.h"

#include "originator.h"

#include "packet.h"

#include "routing.h"

#include "send.h"

#include "translation-table.h"

net/batman-adv/bat_v.c

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/workqueue.h>

#include <net/genetlink.h>

#include <net/netlink.h>

#include <uapi/linux/batadv_packet.h>

#include <uapi/linux/batman_adv.h>



#include "bat_algo.h"
@@ -49,7 +50,6 @@ 
#include "log.h"

#include "netlink.h"

#include "originator.h"

#include "packet.h"



struct sk_buff;

net/batman-adv/bat_v_elp.c

+1 −1
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ 
#include <linux/types.h>

#include <linux/workqueue.h>

#include <net/cfg80211.h>

#include <uapi/linux/batadv_packet.h>



#include "bat_algo.h"

#include "bat_v_ogm.h"

#include "hard-interface.h"

#include "log.h"

#include "originator.h"

#include "packet.h"

#include "routing.h"

#include "send.h"