Skip to content

Commit

Permalink
net: dsa: kill off dsa_priv.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
vladimiroltean authored and kuba-moo committed Nov 23, 2022
1 parent 19d05ea commit 5917bfe
Showing 8 changed files with 14 additions and 25 deletions.
4 changes: 3 additions & 1 deletion net/dsa/dsa.c
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 19 deletions net/dsa/dsa_priv.h

This file was deleted.

2 changes: 1 addition & 1 deletion net/dsa/netlink.c
Original file line number Diff line number Diff line change
@@ -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 changes: 8 additions & 0 deletions net/dsa/netlink.h
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion net/dsa/slave.c
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion net/dsa/switch.c
Original file line number Diff line number Diff line change
@@ -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 change: 0 additions & 1 deletion net/dsa/tag_8021q.c
Original file line number Diff line number Diff line change
@@ -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 change: 0 additions & 1 deletion net/dsa/tag_hellcreek.c
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
#include <linux/skbuff.h>
#include <net/dsa.h>

#include "dsa_priv.h"
#include "tag.h"

#define HELLCREEK_NAME "hellcreek"

0 comments on commit 5917bfe

Please sign in to comment.