diff --git a/openair2/NAS/DRIVER/CELLULAR/NASRG/Makefile b/openair2/NAS/DRIVER/CELLULAR/NASRG/Makefile index 4e70309dcb3e2a99fce2e8a3add347044fcdec82..21e83ee927919f36d389c83dbf7eef0040454725 100755 --- a/openair2/NAS/DRIVER/CELLULAR/NASRG/Makefile +++ b/openair2/NAS/DRIVER/CELLULAR/NASRG/Makefile @@ -2,58 +2,14 @@ # NAS_UPDIR := $(shell /bin/pwd) -KERNEL_NAME=$(shell echo `uname -r`) - -KERNEL_MAIN_TYPE=$(shell echo `uname -r | cut -d. -f-2 | tr "." "_"`) -export KERNEL_MAIN_TYPE - -KERNEL_MAIN_VERSION=$(shell echo `uname -r | cut -d. -f-1`) - -ifeq ($(IS_LINUX), 1) -SUBVERSION=$(shell echo `grep '^SUBLEVEL =' /usr/src/linux/Makefile | sed -e 's, ,,g' | sed -e 's/SUBLEVEL=//'`) -else -ifeq ($(IS_KERNEL_OPENAIRINTERFACE), 1) -SUBVERSION=$(shell echo `grep '^SUBLEVEL =' /usr/src/linux-$(KERNEL_NAME)/Makefile | sed -e 's, ,,g' | sed -e 's/SUBLEVEL=//'`) -else -SUBVERSION=$(shell echo `grep '^SUBLEVEL =' /usr/src/linux-headers-$(KERNEL_NAME)/Makefile | sed -e 's, ,,g' | sed -e 's/SUBLEVEL=//'`) -endif -endif - - - -IS_KERNEL_SUBVERSION_GREATER_THAN_20=$(shell if [ $(SUBVERSION) -ge 20 ] ; then echo true ; fi) -KERNEL_ARCH=$(shell echo `uname -m`) -#SET_REGPARM=$(shell if [ $(KERNEL_ARCH) = 'i686' -a $(SUBVERSION) -ge 20 ]; then echo true ; fi) -SET_X64=$(shell if [ $(KERNEL_ARCH) = 'x86_64' -a $(SUBVERSION) -ge 20 ]; then echo true ; fi) - -IS_KERNEL_SUBVERSION_GREATER_THAN_22=$(shell if [ $(SUBVERSION) -ge 22 ] ; then echo true ; fi) -IS_KERNEL_SUBVERSION_GREATER_THAN_29=$(shell if [ $(SUBVERSION) -ge 29 ] ; then echo true ; fi) -IS_KERNEL_SUBVERSION_GREATER_THAN_30=$(shell if [ $(SUBVERSION) -ge 30 ] ; then echo true ; fi) -IS_KERNEL_SUBVERSION_GREATER_THAN_32=$(shell if [ $(SUBVERSION) -ge 32 ] ; then echo true ; fi) - -# Add global rule for V3 kernels -ifeq ($(KERNEL_MAIN_VERSION),3) - IS_KERNEL_SUBVERSION_GREATER_THAN_22 = "true" - IS_KERNEL_SUBVERSION_GREATER_THAN_29 = "true" - IS_KERNEL_SUBVERSION_GREATER_THAN_30 = "true" - IS_KERNEL_SUBVERSION_GREATER_THAN_32 = "true" - IS_KERNEL_MAIN_VERSION_IS_3 = "true" -endif - -GT2622= $(if $(IS_KERNEL_SUBVERSION_GREATER_THAN_22),-DKERNEL_VERSION_GREATER_THAN_2622=1) -GT2629= $(if $(IS_KERNEL_SUBVERSION_GREATER_THAN_29),-DKERNEL_VERSION_GREATER_THAN_2629=1) -GT32= $(if $(IS_KERNEL_SUBVERSION_GREATER_THAN_32),-DKERNEL_VERSION_GREATER_THAN_32=1) -V3= $(if $(IS_KERNEL_MAIN_VERSION_IS_3),-DKERNEL_MAIN_VERSION_IS_3=1) #################################################### # D E B U G F L A G S #################################################### - - #################################################### # EXTRA COMPILER FLAGS #################################################### -EXTRA_CFLAGS = -fno-common $(if $(IS_KERNEL_SUBVERSION_GREATER_THAN_20),-mregparm=3 -fno-stack-protector -mpreferred-stack-boundary=4) $(if $(SET_X64),-DARCH_64,) $(if $(SET_X64),-mcmodel=kernel,) $(if $(SET_X64),-m64,) $(GT2622) $(GT2629) $(V3) $(GT32) +EXTRA_CFLAGS = -fno-common -mregparm=3 -fno-stack-protector -mpreferred-stack-boundary=4 $(if $(SET_X64),-DARCH_64,) $(if $(SET_X64),-mcmodel=kernel,) $(if $(SET_X64),-m64,) ifdef ADDRCONF EXTRA_CFLAGS += -DADDRCONF @@ -109,14 +65,6 @@ endif #nasmesh.ko: # make V=1 -C /usr/src/linux-$(shell echo `uname -r`) M=`pwd` modules print: - @echo linux kernel ge 22: $(IS_KERNEL_SUBVERSION_GREATER_THAN_22) - @echo kernel name : $(KERNEL_NAME) - @echo subversion : $(SUBVERSION) - @echo flag gt2622: $(GT2622) - @echo linux kernel ge 29: $(IS_KERNEL_SUBVERSION_GREATER_THAN_29) - @echo flag gt2629: $(GT2629) - @echo linux kernel ge 30: $(IS_KERNEL_SUBVERSION_GREATER_THAN_30) - @echo flag KERNEL_MAIN_VERSION $(KERNEL_MAIN_VERSION) @echo RRC_DIR $(RRC_DIR) clean: rm -f *.ko diff --git a/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c b/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c index 1da48cd724cae740e972bb2699987b9372b62079..ce2853d7cb43f2205584cb06464ed7644761572d 100755 --- a/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c +++ b/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c @@ -118,12 +118,6 @@ int nasrg_open(struct net_device *dev){ } #endif //NETLINK -// next lines prevent compilation of the driver with kernel version under 2.6.29 -// ATTENTION !!!!!! NASRG is not usable with these versions -#ifndef KERNEL_VERSION_GREATER_THAN_2629 - kernel_version_under_2629_not supported_by_nasrg = 0; -#endif - if(!netif_queue_stopped(dev)) netif_start_queue(dev); else