Commit 5917bfe6 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: kill off dsa_priv.h 



The last remnants in dsa_priv.h are a netlink-related definition for
which we create a new header, and DSA_MAX_NUM_OFFLOADING_BRIDGES which
is only used from dsa.c, so move it there.

Some inclusions need to be adjusted now that we no longer have headers
included transitively from dsa_priv.h.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 19d05ea7

net/dsa/dsa.c

+3 −1
Original line number Diff line number Diff line
@@ -21,13 +21,15 @@ 


#include "devlink.h"

#include "dsa.h"

#include "dsa_priv.h"

#include "master.h"

#include "netlink.h"

#include "port.h"

#include "slave.h"

#include "switch.h"

#include "tag.h"



#define DSA_MAX_NUM_OFFLOADING_BRIDGES		BITS_PER_LONG



static DEFINE_MUTEX(dsa2_mutex);

LIST_HEAD(dsa_tree_list);

net/dsa/dsa_priv.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * net/dsa/dsa_priv.h - Hardware switch handling

 * Copyright (c) 2008-2009 Marvell Semiconductor

 */



#ifndef __DSA_PRIV_H

#define __DSA_PRIV_H



#include <linux/phy.h>

#include <linux/netdevice.h>

#include <net/dsa.h>



#define DSA_MAX_NUM_OFFLOADING_BRIDGES		BITS_PER_LONG



/* netlink.c */

extern struct rtnl_link_ops dsa_link_ops __read_mostly;



#endif

net/dsa/netlink.c

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

#include <net/rtnetlink.h>



#include "dsa_priv.h"

#include "netlink.h"

#include "slave.h"



static const struct nla_policy dsa_policy[IFLA_DSA_MAX + 1] = {

net/dsa/netlink.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */



#ifndef __DSA_NETLINK_H

#define __DSA_NETLINK_H



extern struct rtnl_link_ops dsa_link_ops __read_mostly;



#endif

net/dsa/slave.c

+1 −1
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include <linux/netpoll.h>



#include "dsa.h"

#include "dsa_priv.h"

#include "port.h"

#include "master.h"

#include "netlink.h"

#include "slave.h"

#include "tag.h"