2019-02-22 20:34:17

by Florian Fainelli

Subject: [PATCH net-next 2/2] net: Remove switchdev.h inclusion from team/bond/vlan

This is no longer necessary after eca59f691566 ("net: Remove support for bridge bypass ndos from stacked devices")

Suggested-by: Ido Schimmel <[email protected]>
Signed-off-by: Florian Fainelli <[email protected]>
---
drivers/net/bonding/bond_main.c | 1 -
drivers/net/team/team.c | 1 -
net/8021q/vlan_dev.c | 1 -
3 files changed, 3 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 485462d3087f..a044a8032a0f 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -77,7 +77,6 @@
#include <net/pkt_sched.h>
#include <linux/rculist.h>
#include <net/flow_dissector.h>
-#include <net/switchdev.h>
#include <net/bonding.h>
#include <net/bond_3ad.h>
#include <net/bond_alb.h>
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 958f1cf67282..3ff23a993668 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -28,7 +28,6 @@
#include <net/genetlink.h>
#include <net/netlink.h>
#include <net/sch_generic.h>
-#include <net/switchdev.h>
#include <generated/utsrelease.h>
#include <linux/if_team.h>

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index b2d9c8f27cd7..15293c2a5dd8 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -31,7 +31,6 @@
#include <linux/ethtool.h>
#include <linux/phy.h>
#include <net/arp.h>
-#include <net/switchdev.h>

#include "vlan.h"
#include "vlanproc.h"
--
2.17.1

2019-02-22 20:48:18

by Andy Gospodarek

Subject: Re: [PATCH net-next 2/2] net: Remove switchdev.h inclusion from team/bond/vlan

On Fri, Feb 22, 2019 at 12:31:34PM -0800, Florian Fainelli wrote:
> This is no longer necessary after eca59f691566 ("net: Remove support for bridge bypass ndos from stacked devices")
>
> Suggested-by: Ido Schimmel <[email protected]>
> Signed-off-by: Florian Fainelli <[email protected]>

Reviewed-by: Andy Gospodarek <[email protected]>

> ---
> drivers/net/bonding/bond_main.c | 1 -
> drivers/net/team/team.c | 1 -
> net/8021q/vlan_dev.c | 1 -
> 3 files changed, 3 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 485462d3087f..a044a8032a0f 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -77,7 +77,6 @@
> #include <net/pkt_sched.h>
> #include <linux/rculist.h>
> #include <net/flow_dissector.h>
> -#include <net/switchdev.h>
> #include <net/bonding.h>
> #include <net/bond_3ad.h>
> #include <net/bond_alb.h>
> diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
> index 958f1cf67282..3ff23a993668 100644
> --- a/drivers/net/team/team.c
> +++ b/drivers/net/team/team.c
> @@ -28,7 +28,6 @@
> #include <net/genetlink.h>
> #include <net/netlink.h>
> #include <net/sch_generic.h>
> -#include <net/switchdev.h>
> #include <generated/utsrelease.h>
> #include <linux/if_team.h>
>
> diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
> index b2d9c8f27cd7..15293c2a5dd8 100644
> --- a/net/8021q/vlan_dev.c
> +++ b/net/8021q/vlan_dev.c
> @@ -31,7 +31,6 @@
> #include <linux/ethtool.h>
> #include <linux/phy.h>
> #include <net/arp.h>
> -#include <net/switchdev.h>
>
> #include "vlan.h"
> #include "vlanproc.h"
> --
> 2.17.1
>

2019-02-24 10:05:15

by Jiri Pirko

Subject: Re: [PATCH net-next 2/2] net: Remove switchdev.h inclusion from team/bond/vlan

Fri, Feb 22, 2019 at 09:31:34PM CET, [email protected] wrote:
>This is no longer necessary after eca59f691566 ("net: Remove support for bridge bypass ndos from stacked devices")
>
>Suggested-by: Ido Schimmel <[email protected]>
>Signed-off-by: Florian Fainelli <[email protected]>

Acked-by: Jiri Pirko <[email protected]>