[Glibc-bsd-commits] r5767 - in trunk/kfreebsd-10/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-08-26 18:58:39 +0000 (Wed, 26 Aug 2015)
New Revision: 5767

Added:
   trunk/kfreebsd-10/debian/patches/EN-15_14.ixgbe.patch
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
Log:
EN-15:14: Disabled ixgbe(4) flow-director support, due to an 
implementation bug.


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2015-08-26 18:57:42 UTC (rev 5766)
+++ trunk/kfreebsd-10/debian/changelog	2015-08-26 18:58:39 UTC (rev 5767)
@@ -7,6 +7,8 @@
   * Pick SVN r287146 from FreeBSD 10.1-RELEASE:
     - SA-15:21: Fix local privilege escalation in IRET handler.
       (CVE-2015-5675) (Closes: #796996)
+    - EN-15:14: Disabled ixgbe(4) flow-director support, due to an 
+      implementation bug.
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 22 Aug 2015 00:58:41 +0100
 

Added: trunk/kfreebsd-10/debian/patches/EN-15_14.ixgbe.patch
===================================================================
--- trunk/kfreebsd-10/debian/patches/EN-15_14.ixgbe.patch	                        (rev 0)
+++ trunk/kfreebsd-10/debian/patches/EN-15_14.ixgbe.patch	2015-08-26 18:58:39 UTC (rev 5767)
@@ -0,0 +1,28 @@
+Description:
+ Disabled ixgbe(4) flow-director support. [EN-15:14]
+Origin: vendor
+Bug: https://www.freebsd.org/security/advisories/FreeBSD-EN-15:14.ixgbe.asc
+Applied-Upstream: https://svnweb.freebsd.org/base?view=revision&revision=287146
+
+--- a/sys/conf/files
++++ b/sys/conf/files
+@@ -1704,7 +1704,7 @@
+ dev/ixgb/ixgb_ee.c		optional ixgb
+ dev/ixgb/ixgb_hw.c		optional ixgb
+ dev/ixgbe/ixgbe.c		optional ixgbe inet \
+-	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP -DIXGBE_FDIR"
++	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
+ dev/ixgbe/ixv.c			optional ixgbe inet \
+ 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+ dev/ixgbe/ixgbe_phy.c		optional ixgbe inet \
+--- a/sys/modules/ixgbe/Makefile
++++ b/sys/modules/ixgbe/Makefile
+@@ -12,7 +12,7 @@
+ SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
+ SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
+ SRCS    += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
+-CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
++CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
+ 
+ .if !defined(KERNBUILDDIR)
+ .if ${MK_INET_SUPPORT} != "no"

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2015-08-26 18:57:42 UTC (rev 5766)
+++ trunk/kfreebsd-10/debian/patches/series	2015-08-26 18:58:39 UTC (rev 5767)
@@ -48,3 +48,4 @@
 SA-15_15.tcp.patch
 EN-15_07.zfs.patch
 SA-15_21.amd64.patch
+EN-15_14.ixgbe.patch