Modify

Opened 10 years ago

Closed 10 years ago

Last modified 9 years ago

#2394 closed defect (worksforme)

ar7: Update acx to 20070610

Reported by: nabcore Owned by: developers
Priority: normal Milestone: Kamikaze 8.09 RC1
Component: packages Version:
Keywords: ar7 acx Cc:

Description

As per http://forum.openwrt.org/viewtopic.php?pid=55731#p55731

I assuming only the file https://dev.openwrt.org/browser/trunk/package/acx/Makefile will need patching but at this moment in time.

But, I'm not sure if the updated acx-20070610.tar.bz2 will play nice with these patches here https://dev.openwrt.org/browser/trunk/package/acx/patches

Attachments (1)

skb_reset_mac_header.diff (503 bytes) - added by matteo 10 years ago.

Download all attachments as: .zip

Change History (7)

comment:1 Changed 10 years ago by nabcore

Actually, the difference between 20070101 (current trunk) and 20070610 is very small:

[user@host acx]$ diff acx-20070101 acx-20070610
diff acx-20070101/common.c acx-20070610/common.c
2756a2757,2759
> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
>       skb_reset_mac_header(skb);
> #else
2757a2761
> #endif
Common subdirectories: acx-20070101/pktgen and acx-20070610/pktgen
Common subdirectories: acx-20070101/script and acx-20070610/script

Has this change been partially incorporated in via https://dev.openwrt.org/browser/trunk/package/acx/patches/003-2.6.22_compat.patch
?

It looks it may need a:

//    skb->mac.raw = skb->data; 
skb_reset_mac_header(skb);

as well?

Changed 10 years ago by matteo

comment:2 Changed 10 years ago by matteo

Just apply that patch and it will fix the panic

comment:3 Changed 10 years ago by matteo

  • Resolution set to fixed
  • Status changed from new to closed

Updated in r8797

comment:4 Changed 10 years ago by nabcore

  • Resolution fixed deleted
  • Status changed from closed to reopened

With r8823: I think there is an issue with the patch:

make[3]: Entering directory `/scratch/openwrt/trunk/package/acx'
bzcat /scratch/openwrt/trunk/dl/acx-20070610.tar.bz2 | /bin/gtar -C /scratch/openwrt/trunk/build_dir/linux-ar7 -xf -; chmod -R u+w /scratch/openwrt/trunk/build_dir/linux-ar7/acx-20070610

Applying ./patches/001-no-reset.diff using plaintext:
patching file pci.c

Applying ./patches/002-disable-usb.diff using plaintext:
patching file Makefile
patching file acx_config.h

Applying ./patches/003-2.6.22_compat.patch using plaintext:
patching file common.c
Hunk #1 FAILED at 2754.
1 out of 1 hunk FAILED -- saving rejects to file common.c.rej
Patch failed!  Please fix ./patches/003-2.6.22_compat.patch!
make[3]: *** [/scratch/openwrt/trunk/build_dir/linux-ar7/acx-20070610/.prepared_50c387563f112da8d8bf1811a7af22f7] Error 1
make[3]: Leaving directory `/scratch/openwrt/trunk/package/acx'
make[2]: *** [package/acx/compile] Error 2
make[2]: Leaving directory `/scratch/openwrt/trunk'
make[1]: *** [/scratch/openwrt/trunk/staging_dir/mipsel/stamp/.package_compile] Error 2
make[1]: Leaving directory `/scratch/openwrt/trunk'
make: *** [world] Error 2

And looking at the reject file:

[user@host trunk]$ more /scratch/openwrt/trunk/build_dir/linux-ar7/acx-20070610/common.c.rej
***************
*** 2754,2760 ****
        skb->dev = adev->ndev;
        skb->dev->last_rx = jiffies;

-       skb->mac.raw = skb->data;
        skb->ip_summed = CHECKSUM_NONE;
        skb->pkt_type = PACKET_OTHERHOST;
        skb->protocol = htons(ETH_P_80211_RAW);
--- 2754,2760 ----
        skb->dev = adev->ndev;
        skb->dev->last_rx = jiffies;

+       skb_reset_mac_header(skb);
        skb->ip_summed = CHECKSUM_NONE;
        skb->pkt_type = PACKET_OTHERHOST;
        skb->protocol = htons(ETH_P_80211_RAW);

comment:5 Changed 10 years ago by nabcore

Sorry, My mistake! The patch had not been removed from my tree as per https://dev.openwrt.org/changeset/8797/trunk/package/acx/patches

I'm sorry; please close.

comment:6 Changed 10 years ago by nico

  • Resolution set to worksforme
  • Status changed from reopened to closed

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.