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

Commit ab889e66 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge

parents dcf96f1f 3878f1f0

net/batman-adv/icmp_socket.c

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

#include "icmp_socket.h"

#include "send.h"

#include "types.h"

#include "hash.h"

#include "originator.h"

#include "hard-interface.h"

net/batman-adv/icmp_socket.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_

#define _NET_BATMAN_ADV_ICMP_SOCKET_H_



#include "types.h"



#define ICMP_SOCKET "socket"



void bat_socket_init(void);

net/batman-adv/main.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "translation-table.h"

#include "hard-interface.h"

#include "gateway_client.h"

#include "types.h"

#include "vis.h"

#include "hash.h"

net/batman-adv/routing.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "icmp_socket.h"

#include "translation-table.h"

#include "originator.h"

#include "types.h"

#include "ring_buffer.h"

#include "vis.h"

#include "aggregation.h"

net/batman-adv/routing.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#ifndef _NET_BATMAN_ADV_ROUTING_H_

#define _NET_BATMAN_ADV_ROUTING_H_



#include "types.h"



void slide_own_bcast_window(struct batman_if *batman_if);

void receive_bat_packet(struct ethhdr *ethhdr,

				struct batman_packet *batman_packet,