mirror/accel-ppp
1
0
Fork 0
mirror of https://github.com/accel-ppp/accel-ppp.git synced 2025-12-20 01:21:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipoe/vlan_mon: Add proper accel_ppp_version to vlan_mon and ipoe

Browse Source 
Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
This commit is contained in:
Denys Fedoryshchenko
2024-04-02 00:16:33 +03:00
parent 6afbc5075a
commit 6de7ff916b
6 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -49,7 +49,8 @@ ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT)
include(cmake/cpack.cmake)
ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}")
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
if (NOT BUILD_DRIVER_ONLY)
if (MEMDEBUG)

2
drivers/ipoe/CMakeLists.txt
View File

@@ -1,3 +1,4 @@
if (NOT DEFINED KDIR)
set(KDIR "/usr/src/linux")
endif (NOT DEFINED KDIR)
@@ -6,6 +7,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/driver/ipoe.ko
COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND ln -sf ${CMAKE_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND make -C ${KDIR} M=${CMAKE_CURRENT_BINARY_DIR}/driver modules
DEPENDS ipoe.c ipoe.h
)

3
drivers/ipoe/ipoe.c
View File

@@ -33,6 +33,7 @@
#include <net/ip6_route.h>
#include "ipoe.h"
#include "version.h"
#define BEGIN_UPDATE 1
#define UPDATE 2
@@ -1909,7 +1910,7 @@ static int __init ipoe_init(void)
{
int err, i;
printk("IPoE session driver v1.11\n");
printk("IPoE session driver v%s\n", ACCEL_PPP_VERSION);
/*err = register_pernet_device(&ipoe_net_ops);
if (err < 0)

1
drivers/vlan_mon/CMakeLists.txt
View File

@@ -6,6 +6,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/driver/vlan_mon.ko
COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND ln -sf ${CMAKE_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/driver
COMMAND make -C ${KDIR} M=${CMAKE_CURRENT_BINARY_DIR}/driver modules
DEPENDS vlan_mon.c vlan_mon.h
)

3
drivers/vlan_mon/vlan_mon.c
View File

@@ -18,6 +18,7 @@
#include <net/netns/generic.h>
#include "vlan_mon.h"
#include "version.h"
#define VLAN_MON_MAGIC 0x639fa78c
@@ -728,7 +729,7 @@ static int __init vlan_mon_init(void)
int i;
#endif
printk("vlan-mon driver v1.11\n");
printk("vlan-mon driver v%s\n", ACCEL_PPP_VERSION);
INIT_WORK(&vlan_notify_work, vlan_do_notify);

1
version.h.in Normal file
View File

@@ -0,0 +1 @@
#define ACCEL_PPP_VERSION "@ACCEL_PPP_VERSION@"