diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/aux-files/linux-libre/5.4-i686.conf | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.zip | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/aux-files/linux-libre/5.4-i686.conf')
| -rw-r--r-- | gnu/packages/aux-files/linux-libre/5.4-i686.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/aux-files/linux-libre/5.4-i686.conf b/gnu/packages/aux-files/linux-libre/5.4-i686.conf index 3727f9d486..cc2d8dde01 100644 --- a/gnu/packages/aux-files/linux-libre/5.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/5.4-i686.conf @@ -1027,7 +1027,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set # CONFIG_SMC is not set -# CONFIG_XDP_SOCKETS is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y |