github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1325 from avsm/kernel-mellanox

Browse Source 
kernel: activate the Mellanox network driver suite
This commit is contained in:
Justin Cormack 2017-03-17 21:52:27 +00:00 committed by GitHub
commit 3a08ac981d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/Makefile
View File

@ -20,12 +20,12 @@ all: bzImage tag
# IMAGE_VERSION is used to determine if a new image should be pushed to hub.
ifdef LTS4.4
KERNEL_VERSION=4.4.54
IMAGE_VERSION=$(KERNEL_VERSION)-1
IMAGE_VERSION=$(KERNEL_VERSION)-2
IMAGE_MAJOR_VERSION=4.4.x
DEPS=Dockerfile.4.4 Makefile kernel_config kernel_config.debug kernel_config.4.4 patches-4.4
else
KERNEL_VERSION=4.9.15
IMAGE_VERSION=$(KERNEL_VERSION)-1
IMAGE_VERSION=$(KERNEL_VERSION)-2
IMAGE_MAJOR_VERSION=4.9.x
DEPS=Dockerfile Makefile kernel_config kernel_config.debug patches-4.9
endif

2
kernel/kernel_config
View File

@ -1774,7 +1774,7 @@ CONFIG_IXGBEVF=y
# CONFIG_NET_VENDOR_I825XX is not set
# CONFIG_JME is not set
# CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MELLANOX is not set
CONFIG_NET_VENDOR_MELLANOX=y
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MYRI is not set
# CONFIG_FEALNX is not set