| Message ID | 20240329082847.1902685-3-liuhangbin@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | doc/netlink: add a YAML spec for team | expand |
On Fri, 29 Mar 2024 16:28:45 +0800 Hangbin Liu wrote: > diff --git a/Documentation/netlink/specs/team.yaml b/Documentation/netlink/specs/team.yaml > index 907f54c1f2e3..c13529e011c9 100644 > --- a/Documentation/netlink/specs/team.yaml > +++ b/Documentation/netlink/specs/team.yaml > @@ -202,5 +202,3 @@ operations: > attributes: > - team-ifindex > - list-port > - - item-port > - - attr-port I think you squashed this into the wrong patch :S
On Fri, Mar 29, 2024 at 03:08:04PM -0700, Jakub Kicinski wrote: > On Fri, 29 Mar 2024 16:28:45 +0800 Hangbin Liu wrote: > > diff --git a/Documentation/netlink/specs/team.yaml b/Documentation/netlink/specs/team.yaml > > index 907f54c1f2e3..c13529e011c9 100644 > > --- a/Documentation/netlink/specs/team.yaml > > +++ b/Documentation/netlink/specs/team.yaml > > @@ -202,5 +202,3 @@ operations: > > attributes: > > - team-ifindex > > - list-port > > - - item-port > > - - attr-port > > I think you squashed this into the wrong patch :S Ah, my bad. I need more careful and double checks before post them... Hangbin
diff --git a/Documentation/netlink/specs/team.yaml b/Documentation/netlink/specs/team.yaml index 907f54c1f2e3..c13529e011c9 100644 --- a/Documentation/netlink/specs/team.yaml +++ b/Documentation/netlink/specs/team.yaml @@ -202,5 +202,3 @@ operations: attributes: - team-ifindex - list-port - - item-port - - attr-port diff --git a/drivers/net/team/Makefile b/drivers/net/team/Makefile index f582d81a5091..244db32c1060 100644 --- a/drivers/net/team/Makefile +++ b/drivers/net/team/Makefile @@ -3,6 +3,7 @@ # Makefile for the network team driver # +team-y:= team_core.o obj-$(CONFIG_NET_TEAM) += team.o obj-$(CONFIG_NET_TEAM_MODE_BROADCAST) += team_mode_broadcast.o obj-$(CONFIG_NET_TEAM_MODE_ROUNDROBIN) += team_mode_roundrobin.o diff --git a/drivers/net/team/team.c b/drivers/net/team/team_core.c similarity index 100% rename from drivers/net/team/team.c rename to drivers/net/team/team_core.c
Similar with commit 08d323234d10 ("net: fou: rename the source for linking"), We'll need to link two objects together to form the team module. This means the source can't be called team, the build system expects team.o to be the combined object. Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- Documentation/netlink/specs/team.yaml | 2 -- drivers/net/team/Makefile | 1 + drivers/net/team/{team.c => team_core.c} | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename drivers/net/team/{team.c => team_core.c} (100%)