Commit 94ef6fad authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: move headers exported by master.c to master.h 



Minimize the use of the bloated dsa_priv.h by moving the prototypes
exported by master.c to their own header file.

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 022bba63

net/dsa/dsa2.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include "devlink.h"

#include "dsa_priv.h"

#include "master.h"

#include "port.h"



static DEFINE_MUTEX(dsa2_mutex);

net/dsa/dsa_priv.h

+0 −9
Original line number Diff line number Diff line
@@ -259,15 +259,6 @@ static inline int dsa_tag_protocol_overhead(const struct dsa_device_ops *ops) 
	return ops->needed_headroom + ops->needed_tailroom;

}



/* master.c */

int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp);

void dsa_master_teardown(struct net_device *dev);

int dsa_master_lag_setup(struct net_device *lag_dev, struct dsa_port *cpu_dp,

			 struct netdev_lag_upper_info *uinfo,

			 struct netlink_ext_ack *extack);

void dsa_master_lag_teardown(struct net_device *lag_dev,

			     struct dsa_port *cpu_dp);



static inline struct net_device *dsa_master_find_slave(struct net_device *dev,

						       int device, int port)

{

net/dsa/master.c

+6 −0
Original line number Diff line number Diff line
@@ -6,7 +6,13 @@ 
 *	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

 */



#include <linux/ethtool.h>

#include <linux/netdevice.h>

#include <linux/netlink.h>

#include <net/dsa.h>



#include "dsa_priv.h"

#include "master.h"

#include "port.h"



static int dsa_master_get_regs_len(struct net_device *dev)

net/dsa/master.h

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



#ifndef __DSA_MASTER_H

#define __DSA_MASTER_H



struct dsa_port;

struct net_device;

struct netdev_lag_upper_info;

struct netlink_ext_ack;



int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp);

void dsa_master_teardown(struct net_device *dev);

int dsa_master_lag_setup(struct net_device *lag_dev, struct dsa_port *cpu_dp,

			 struct netdev_lag_upper_info *uinfo,

			 struct netlink_ext_ack *extack);

void dsa_master_lag_teardown(struct net_device *lag_dev,

			     struct dsa_port *cpu_dp);



#endif

net/dsa/slave.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "dsa_priv.h"

#include "port.h"

#include "master.h"



static void dsa_slave_standalone_event_work(struct work_struct *work)

{