Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 01:02:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dsa: kill off dsa_priv.h

Browse Source 
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: 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:55 +02:00 committed by Jakub Kicinski
parent 19d05ea712
commit 5917bfe688
8 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/dsa/dsa.c
View File

@ -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);

19
net/dsa/dsa_priv.h
View File

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

2
net/dsa/netlink.c
View File

@ -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] = {

8
net/dsa/netlink.h Normal file
View File

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

2
net/dsa/slave.c
View File

@ -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"

2
net/dsa/switch.c
View File

@ -13,7 +13,7 @@
#include <net/switchdev.h>
#include "dsa.h"
#include "dsa_priv.h"
#include "netlink.h"
#include "port.h"
#include "slave.h"
#include "switch.h"

1
net/dsa/tag_8021q.c
View File

@ -7,7 +7,6 @@
#include <linux/if_vlan.h>
#include <linux/dsa/8021q.h>
#include "dsa_priv.h"
#include "port.h"
#include "switch.h"
#include "tag.h"

1
net/dsa/tag_hellcreek.c
View File

@ -11,7 +11,6 @@
#include <linux/skbuff.h>
#include <net/dsa.h>
#include "dsa_priv.h"
#include "tag.h"
#define HELLCREEK_NAME "hellcreek"