Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-07 13:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Vladimir Oltean 2022-11-21 15:55:45 +02:00 committed by Jakub Kicinski
parent 022bba63c3
commit 94ef6fad3b
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/dsa/dsa2.c
View File

@ -19,6 +19,7 @@
#include "devlink.h" #include "devlink.h"
#include "dsa_priv.h" #include "dsa_priv.h"
#include "master.h"
#include "port.h" #include "port.h"
static DEFINE_MUTEX(dsa2_mutex); static DEFINE_MUTEX(dsa2_mutex);

9
net/dsa/dsa_priv.h
View File

@ -259,15 +259,6 @@ static inline int dsa_tag_protocol_overhead(const struct dsa_device_ops *ops)
return ops->needed_headroom + ops->needed_tailroom; 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, static inline struct net_device *dsa_master_find_slave(struct net_device *dev,
int device, int port) int device, int port)
{ {

6
net/dsa/master.c
View File

@ -6,7 +6,13 @@
* Vivien Didelot <vivien.didelot@savoirfairelinux.com> * 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 "dsa_priv.h"
#include "master.h"
#include "port.h" #include "port.h"
static int dsa_master_get_regs_len(struct net_device *dev) static int dsa_master_get_regs_len(struct net_device *dev)

19
net/dsa/master.h Normal file
View File

@ -0,0 +1,19 @@
/* 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

1
net/dsa/slave.c
View File

@ -24,6 +24,7 @@
#include "dsa_priv.h" #include "dsa_priv.h"
#include "port.h" #include "port.h"
#include "master.h"
static void dsa_slave_standalone_event_work(struct work_struct *work) static void dsa_slave_standalone_event_work(struct work_struct *work)
{ {