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

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

Merge branch 'dsa-devlink' 



Andrew Lunn says:

====================
break include loop and dsa devlink support

These two patches add very basic support for devlink to DSA, in
preparation for playing with dpipe.

The first patch is needed to break an include loop between
netdevice.h, dsa.h and devlink.h. We need to remove dsa.h from
netdevice.h. As a result, some files fail to compile, because they
require includes pulled in via dsa.h. So this patch adds a number of
includes in various places. The majority is within the network
subsystem, but cifs also needs a few fixes.

0-day has been chewing on this for over a day now, and not found any
breakage. But Arnd's randconfig might uncover something.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0e42c721 96567d5d

drivers/net/dsa/bcm_sf2_cfp.c

+2 −1
Original line number Diff line number Diff line
@@ -10,10 +10,11 @@ 
 */



#include <linux/list.h>

#include <net/dsa.h>

#include <linux/ethtool.h>

#include <linux/if_ether.h>

#include <linux/in.h>

#include <linux/netdevice.h>

#include <net/dsa.h>

#include <linux/bitmap.h>



#include "bcm_sf2.h"

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

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

#include <linux/gpio/consumer.h>

#include <linux/phy.h>

#include <net/dsa.h>



#ifndef UINT64_MAX

#define UINT64_MAX		(u64)(~((u64)0))

drivers/net/ethernet/broadcom/bcmsysport.c

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

#include <linux/phy.h>

#include <linux/phy_fixed.h>

#include <net/dsa.h>

#include <net/ip.h>

#include <net/ipv6.h>

drivers/net/ethernet/freescale/fman/fman_memac.h

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



#include <linux/netdevice.h>

#include <linux/phy_fixed.h>



struct fman_mac *memac_config(struct fman_mac_params *params);

int memac_set_promiscuous(struct fman_mac *memac, bool new_val);

drivers/net/ethernet/hisilicon/hns/hnae.c

+1 −1
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 


#include <linux/dma-mapping.h>

#include <linux/interrupt.h>

#include <linux/of.h>

#include <linux/skbuff.h>

#include <linux/slab.h>



#include "hnae.h"



#define cls_to_ae_dev(dev) container_of(dev, struct hnae_ae_dev, cls_dev)