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

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

net: Move bonding headers under include/net 



This ways drivers like cxgb4 don't need to do ugly relative includes.

Reported-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4483589f

drivers/net/bonding/bond_3ad.c

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
#include <linux/if_bonding.h>

#include <linux/pkt_sched.h>

#include <net/net_namespace.h>

#include "bonding.h"

#include "bond_3ad.h"

#include <net/bonding.h>

#include <net/bond_3ad.h>



/* General definitions */

#define AD_SHORT_TIMEOUT           1

drivers/net/bonding/bond_alb.c

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#include <net/arp.h>

#include <net/ipv6.h>

#include <asm/byteorder.h>

#include "bonding.h"

#include "bond_alb.h"

#include <net/bonding.h>

#include <net/bond_alb.h>

drivers/net/bonding/bond_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
#include <linux/device.h>

#include <linux/netdevice.h>



#include "bonding.h"

#include "bond_alb.h"

#include <net/bonding.h>

#include <net/bond_alb.h>



#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_NET_NS)

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ 
#include <net/pkt_sched.h>

#include <linux/rculist.h>

#include <net/flow_keys.h>

#include "bonding.h"

#include "bond_3ad.h"

#include "bond_alb.h"

#include <net/bonding.h>

#include <net/bond_3ad.h>

#include <net/bond_alb.h>



/*---------------------------- Module parameters ----------------------------*/

drivers/net/bonding/bond_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/if_ether.h>

#include <net/netlink.h>

#include <net/rtnetlink.h>

#include "bonding.h"

#include <net/bonding.h>



static size_t bond_get_slave_size(const struct net_device *bond_dev,

				  const struct net_device *slave_dev)