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

Commit fcafa5e7 authored May 15, 2016 by Sven Eckelmann Committed by Simon Wunderlich Jun 30, 2016

batman-adv: Keep includes ordered by filename



It is easier to detect if a include is already there for a used
functionality when the includes are ordered. Using an alphabetic order
together with the grouping in commit 1e2c2a4f ("batman-adv: Add
required includes to all files") makes includes better manageable.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

parent 67a5613e

net/batman-adv/bat_iv_ogm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,8 +31,8 @@
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/jiffies.h>		#include <linux/jiffies.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/list.h>
	#include <linux/kref.h>		#include <linux/kref.h>
			#include <linux/list.h>
	#include <linux/lockdep.h>		#include <linux/lockdep.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
	#include <linux/pkt_sched.h>		#include <linux/pkt_sched.h>

net/batman-adv/bat_v_elp.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,11 +15,11 @@
	* along with this program; if not, see <http://www.gnu.org/licenses/>.		* along with this program; if not, see <http://www.gnu.org/licenses/>.
	*/		*/

	#include "main.h"

	#ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_		#ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_
	#define _NET_BATMAN_ADV_BAT_V_ELP_H_		#define _NET_BATMAN_ADV_BAT_V_ELP_H_

			#include "main.h"

	struct sk_buff;		struct sk_buff;
	struct work_struct;		struct work_struct;

net/batman-adv/gateway_common.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,8 @@
	#include "main.h"		#include "main.h"

	#include <linux/atomic.h>		#include <linux/atomic.h>
	#include <linux/errno.h>
	#include <linux/byteorder/generic.h>		#include <linux/byteorder/generic.h>
			#include <linux/errno.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/math64.h>		#include <linux/math64.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>

net/batman-adv/hard-interface.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,9 @@
	#include <linux/byteorder/generic.h>		#include <linux/byteorder/generic.h>
	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/fs.h>		#include <linux/fs.h>
			#include <linux/if.h>
	#include <linux/if_arp.h>		#include <linux/if_arp.h>
	#include <linux/if_ether.h>		#include <linux/if_ether.h>
	#include <linux/if.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/kref.h>		#include <linux/kref.h>
	#include <linux/list.h>		#include <linux/list.h>

net/batman-adv/main.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -181,12 +181,12 @@ enum batadv_uev_type {
	#include <linux/cpumask.h>		#include <linux/cpumask.h>
	#include <linux/etherdevice.h>		#include <linux/etherdevice.h>
	#include <linux/if_ether.h> /* for packet.h */		#include <linux/if_ether.h> /* for packet.h */
			#include <linux/if_vlan.h>
			#include <linux/jiffies.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
			#include <linux/percpu.h>
	#include <linux/printk.h>		#include <linux/printk.h>
	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/percpu.h>
	#include <linux/jiffies.h>
	#include <linux/if_vlan.h>

	#include "types.h"		#include "types.h"