From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 24 Feb 2021 07:03:42 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/network/iproute2/iproute2-next
X-Git-Tag: v5.12.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52c5f3f0432562f5416fc093aff5166b6d2702ed;p=thirdparty%2Fiproute2.git

Merge git://git.kernel.org/pub/scm/network/iproute2/iproute2-next
---

52c5f3f0432562f5416fc093aff5166b6d2702ed
diff --cc dcb/Makefile
index 7c09bb4f2,02d5d044c..3a2e5d4c4
--- a/dcb/Makefile
+++ b/dcb/Makefile
@@@ -5,9 -5,14 +5,15 @@@ TARGETS :
  
  ifeq ($(HAVE_MNL),y)
  
- DCBOBJ = dcb.o dcb_buffer.o dcb_ets.o dcb_maxrate.o dcb_pfc.o
+ DCBOBJ = dcb.o \
+          dcb_app.o \
+          dcb_buffer.o \
+          dcb_dcbx.o \
+          dcb_ets.o \
+          dcb_maxrate.o \
+          dcb_pfc.o
  TARGETS += dcb
 +LDLIBS += -lm
  
  endif