Merge pull request #104 from CGarces/fix_eth_hw_addr_set

Added compatibility with backported kernels for eth_hw_addr_set_fix
jwrdegoede · Jan 21, 2024 · fbd57a1 · fbd57a1
2 parents fb0d92a + e7954c9
commit fbd57a1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,39 +8,38 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-    - id: set-matrix
-      run: |
-        JSON=$(curl https://www.kernel.org/releases.json)
-        VERSIONSARRAY=$(echo $JSON | jq -c '[.releases[] | {version: .version, moniker: .moniker} | select(.moniker != "linux-next") | .version]')
-        echo ::set-output name=matrix::${VERSIONSARRAY}
+      - id: set-matrix
+        run: |
+          JSON=$(curl https://www.kernel.org/releases.json)
+          VERSIONSARRAY=$(echo $JSON | jq -c '[.releases[] | {version: .version, moniker: .moniker} | select(.moniker != "linux-next") | .version]')
+          echo ::set-output name=matrix::${VERSIONSARRAY}
 
   build:
     needs: fetchKernelData
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
-      matrix: 
+      matrix:
         version: ${{fromJson(needs.fetchKernelData.outputs.matrix)}}
         #version: [4.9.248, 4.4.248]
     steps:
-    - name: download-Kernel
-      env: 
-        VERSION: ${{matrix.version }}
-      run: |
-        KERNEL_URL=https://kernel.ubuntu.com/~kernel-ppa/mainline/
-        KERNEL_URL_DETAILS=$(wget --quiet -O - ${KERNEL_URL}v${VERSION}/ | grep -A8 "Build for amd64\|Test amd64")
-        ALL_DEB=$(echo "$KERNEL_URL_DETAILS" |  grep -m1 'all.deb' | cut -d '"' -f 2)
-        AMD64_DEB=$(echo "$KERNEL_URL_DETAILS" | grep -m1 "amd64.deb" | cut -d '"' -f 2)
-        [  -z "$ALL_DEB" ] && exit 1
-        [  -z "$AMD64_DEB" ] && exit 2
-        wget -nv ${KERNEL_URL}v${VERSION}/$AMD64_DEB
-        wget -nv ${KERNEL_URL}v${VERSION}/$ALL_DEB
-        sudo dpkg --force-all -i *.deb
-        echo "KVER=$(echo $ALL_DEB | cut -d '_' -f 2 | rev | cut -c14- | rev)-generic" >> $GITHUB_ENV
-    - name: Set up GCC
-      uses: egor-tensin/setup-gcc@v1
-      with:
-        version: 12
-    - uses: actions/checkout@v2
-    - name: build
-      run: make KVER=$KVER CONFIG_PLATFORM_I386_PC=y CC=cc
+      - name: download-Kernel
+        env:
+          VERSION: ${{matrix.version }}
+        run: |
+          KERNEL_URL=https://kernel.ubuntu.com/~kernel-ppa/mainline/
+          KERNEL_URL_DETAILS=$(wget --quiet -O - ${KERNEL_URL}v${VERSION}/ | grep -A8 "Build for amd64\|Test amd64")
+          ALL_DEB=$(echo "$KERNEL_URL_DETAILS" |  grep -m1 'all.deb' | cut -d '"' -f 2)
+          AMD64_DEB=$(echo "$KERNEL_URL_DETAILS" | grep -m1 "amd64.deb" | cut -d '"' -f 2)
+          [  -z "$ALL_DEB" ] && exit 1
+          [  -z "$AMD64_DEB" ] && exit 2
+          wget -nv ${KERNEL_URL}v${VERSION}/$AMD64_DEB
+          wget -nv ${KERNEL_URL}v${VERSION}/$ALL_DEB
+          wget -nv http://mirrors.kernel.org/ubuntu/pool/main/g/glibc/libc6_2.38-1ubuntu6_amd64.deb
+          sudo dpkg --force-all -i *.deb
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12
+          echo "KVER=$(echo $ALL_DEB | cut -d '_' -f 2 | rev | cut -c14- | rev)-generic" >> $GITHUB_ENV
+      - uses: actions/checkout@v2
+      - name: build
+        run: make KVER=$KVER CONFIG_PLATFORM_I386_PC=y CC=cc
diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h
@@ -226,10 +226,11 @@ typedef void *timer_hdl_context;
 3f6cffb8604b537e3d7ea040d7f4368689638eaf
 adeef3e32146a8d2a73c399dc6f5d76a449131b1
 */
-static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)
+static inline void rtw_eth_hw_addr_set(struct net_device *dev, const u8 *addr)
 {
 	memcpy(dev->dev_addr, addr, ETH_ALEN);
 }
+#define eth_hw_addr_set rtw_eth_hw_addr_set
 #endif
 
 typedef unsigned long systime;