Merge remote-tracking branch 'arne_f/kernel-5.15' into next

This commit is contained in:
Arne Fitzenreiter
2021-11-23 18:05:41 +00:00
45 changed files with 24595 additions and 28605 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -104,6 +104,7 @@
#usr/include/drm/vmwgfx_drm.h
#usr/include/linux
#usr/include/linux/acct.h
#usr/include/linux/acrn.h
#usr/include/linux/adb.h
#usr/include/linux/adfs_fs.h
#usr/include/linux/affs_hardblocks.h
@@ -183,13 +184,16 @@
#usr/include/linux/capi.h
#usr/include/linux/cciss_defs.h
#usr/include/linux/cciss_ioctl.h
#usr/include/linux/ccs.h
#usr/include/linux/cdrom.h
#usr/include/linux/cec-funcs.h
#usr/include/linux/cec.h
#usr/include/linux/cfm_bridge.h
#usr/include/linux/cgroupstats.h
#usr/include/linux/chio.h
#usr/include/linux/cifs
#usr/include/linux/cifs/cifs_mount.h
#usr/include/linux/cifs/cifs_netlink.h
#usr/include/linux/close_range.h
#usr/include/linux/cm4000_cs.h
#usr/include/linux/cn_proc.h
@@ -201,7 +205,7 @@
#usr/include/linux/cramfs_fs.h
#usr/include/linux/cryptouser.h
#usr/include/linux/cuda.h
#usr/include/linux/cyclades.h
#usr/include/linux/cxl_mem.h
#usr/include/linux/cycx_cfm.h
#usr/include/linux/dcbnl.h
#usr/include/linux/dccp.h
@@ -257,6 +261,7 @@
#usr/include/linux/fscrypt.h
#usr/include/linux/fsi.h
#usr/include/linux/fsl_hypervisor.h
#usr/include/linux/fsl_mc.h
#usr/include/linux/fsmap.h
#usr/include/linux/fsverity.h
#usr/include/linux/fuse.h
@@ -306,7 +311,6 @@
#usr/include/linux/if_ether.h
#usr/include/linux/if_fc.h
#usr/include/linux/if_fddi.h
#usr/include/linux/if_frad.h
#usr/include/linux/if_hippi.h
#usr/include/linux/if_infiniband.h
#usr/include/linux/if_link.h
@@ -328,6 +332,7 @@
#usr/include/linux/ife.h
#usr/include/linux/igmp.h
#usr/include/linux/iio
#usr/include/linux/iio/buffer.h
#usr/include/linux/iio/events.h
#usr/include/linux/iio/types.h
#usr/include/linux/ila.h
@@ -339,8 +344,12 @@
#usr/include/linux/input-event-codes.h
#usr/include/linux/input.h
#usr/include/linux/io_uring.h
#usr/include/linux/ioam6.h
#usr/include/linux/ioam6_genl.h
#usr/include/linux/ioam6_iptunnel.h
#usr/include/linux/ioctl.h
#usr/include/linux/iommu.h
#usr/include/linux/ioprio.h
#usr/include/linux/ip.h
#usr/include/linux/ip6_tunnel.h
#usr/include/linux/ip_vs.h
@@ -351,7 +360,6 @@
#usr/include/linux/ipsec.h
#usr/include/linux/ipv6.h
#usr/include/linux/ipv6_route.h
#usr/include/linux/ipx.h
#usr/include/linux/irqnr.h
#usr/include/linux/isdn
#usr/include/linux/isdn/capicmd.h
@@ -376,8 +384,8 @@
#usr/include/linux/kvm.h
#usr/include/linux/kvm_para.h
#usr/include/linux/l2tp.h
#usr/include/linux/landlock.h
#usr/include/linux/libc-compat.h
#usr/include/linux/lightnvm.h
#usr/include/linux/limits.h
#usr/include/linux/lirc.h
#usr/include/linux/llc.h
@@ -389,6 +397,7 @@
#usr/include/linux/map_to_7segment.h
#usr/include/linux/matroxfb.h
#usr/include/linux/max2175.h
#usr/include/linux/mctp.h
#usr/include/linux/mdio.h
#usr/include/linux/media-bus-format.h
#usr/include/linux/media.h
@@ -399,6 +408,8 @@
#usr/include/linux/meye.h
#usr/include/linux/mii.h
#usr/include/linux/minix_fs.h
#usr/include/linux/misc
#usr/include/linux/misc/bcm_vk.h
#usr/include/linux/mman.h
#usr/include/linux/mmc
#usr/include/linux/mmc/ioctl.h
@@ -415,7 +426,6 @@
#usr/include/linux/msdos_fs.h
#usr/include/linux/msg.h
#usr/include/linux/mtio.h
#usr/include/linux/n_r3964.h
#usr/include/linux/nbd-netlink.h
#usr/include/linux/nbd.h
#usr/include/linux/ncsi.h
@@ -450,6 +460,7 @@
#usr/include/linux/netfilter/nfnetlink_conntrack.h
#usr/include/linux/netfilter/nfnetlink_cthelper.h
#usr/include/linux/netfilter/nfnetlink_cttimeout.h
#usr/include/linux/netfilter/nfnetlink_hook.h
#usr/include/linux/netfilter/nfnetlink_log.h
#usr/include/linux/netfilter/nfnetlink_osf.h
#usr/include/linux/netfilter/nfnetlink_queue.h
@@ -597,6 +608,7 @@
#usr/include/linux/nilfs2_api.h
#usr/include/linux/nilfs2_ondisk.h
#usr/include/linux/nitro_enclaves.h
#usr/include/linux/nl80211-vnd-intel.h
#usr/include/linux/nl80211.h
#usr/include/linux/nsfs.h
#usr/include/linux/nubus.h
@@ -651,7 +663,6 @@
#usr/include/linux/raid/md_p.h
#usr/include/linux/raid/md_u.h
#usr/include/linux/random.h
#usr/include/linux/raw.h
#usr/include/linux/rds.h
#usr/include/linux/reboot.h
#usr/include/linux/reiserfs_fs.h
@@ -661,12 +672,14 @@
#usr/include/linux/rfkill.h
#usr/include/linux/rio_cm_cdev.h
#usr/include/linux/rio_mport_cdev.h
#usr/include/linux/rkisp1-config.h
#usr/include/linux/romfs_fs.h
#usr/include/linux/rose.h
#usr/include/linux/route.h
#usr/include/linux/rpl.h
#usr/include/linux/rpl_iptunnel.h
#usr/include/linux/rpmsg.h
#usr/include/linux/rpmsg_types.h
#usr/include/linux/rseq.h
#usr/include/linux/rtc.h
#usr/include/linux/rtnetlink.h
@@ -678,7 +691,6 @@
#usr/include/linux/scif_ioctl.h
#usr/include/linux/screen_info.h
#usr/include/linux/sctp.h
#usr/include/linux/sdla.h
#usr/include/linux/seccomp.h
#usr/include/linux/securebits.h
#usr/include/linux/sed-opal.h
@@ -708,6 +720,7 @@
#usr/include/linux/sound.h
#usr/include/linux/soundcard.h
#usr/include/linux/spi
#usr/include/linux/spi/spi.h
#usr/include/linux/spi/spidev.h
#usr/include/linux/stat.h
#usr/include/linux/stddef.h
@@ -715,6 +728,9 @@
#usr/include/linux/string.h
#usr/include/linux/sunrpc
#usr/include/linux/sunrpc/debug.h
#usr/include/linux/surface_aggregator
#usr/include/linux/surface_aggregator/cdev.h
#usr/include/linux/surface_aggregator/dtx.h
#usr/include/linux/suspend_ioctls.h
#usr/include/linux/swab.h
#usr/include/linux/switchtec_ioctl.h
@@ -813,6 +829,8 @@
#usr/include/linux/vbox_err.h
#usr/include/linux/vbox_vmmdev_types.h
#usr/include/linux/vboxguest.h
#usr/include/linux/vdpa.h
#usr/include/linux/vduse.h
#usr/include/linux/version.h
#usr/include/linux/veth.h
#usr/include/linux/vfio.h
@@ -824,11 +842,14 @@
#usr/include/linux/virtio_9p.h
#usr/include/linux/virtio_balloon.h
#usr/include/linux/virtio_blk.h
#usr/include/linux/virtio_bt.h
#usr/include/linux/virtio_config.h
#usr/include/linux/virtio_console.h
#usr/include/linux/virtio_crypto.h
#usr/include/linux/virtio_fs.h
#usr/include/linux/virtio_gpio.h
#usr/include/linux/virtio_gpu.h
#usr/include/linux/virtio_i2c.h
#usr/include/linux/virtio_ids.h
#usr/include/linux/virtio_input.h
#usr/include/linux/virtio_iommu.h
@@ -836,10 +857,13 @@
#usr/include/linux/virtio_mmio.h
#usr/include/linux/virtio_net.h
#usr/include/linux/virtio_pci.h
#usr/include/linux/virtio_pcidev.h
#usr/include/linux/virtio_pmem.h
#usr/include/linux/virtio_ring.h
#usr/include/linux/virtio_rng.h
#usr/include/linux/virtio_scmi.h
#usr/include/linux/virtio_scsi.h
#usr/include/linux/virtio_snd.h
#usr/include/linux/virtio_types.h
#usr/include/linux/virtio_vsock.h
#usr/include/linux/vm_sockets.h
@@ -851,12 +875,10 @@
#usr/include/linux/wait.h
#usr/include/linux/watch_queue.h
#usr/include/linux/watchdog.h
#usr/include/linux/wimax
#usr/include/linux/wimax.h
#usr/include/linux/wimax/i2400m.h
#usr/include/linux/wireguard.h
#usr/include/linux/wireless.h
#usr/include/linux/wmi.h
#usr/include/linux/wwan.h
#usr/include/linux/x25.h
#usr/include/linux/xattr.h
#usr/include/linux/xdp_diag.h
@@ -888,12 +910,12 @@
#usr/include/rdma/hfi/hfi1_ioctl.h
#usr/include/rdma/hfi/hfi1_user.h
#usr/include/rdma/hns-abi.h
#usr/include/rdma/i40iw-abi.h
#usr/include/rdma/ib_user_ioctl_cmds.h
#usr/include/rdma/ib_user_ioctl_verbs.h
#usr/include/rdma/ib_user_mad.h
#usr/include/rdma/ib_user_sa.h
#usr/include/rdma/ib_user_verbs.h
#usr/include/rdma/irdma-abi.h
#usr/include/rdma/mlx4-abi.h
#usr/include/rdma/mlx5-abi.h
#usr/include/rdma/mlx5_user_ioctl_cmds.h

View File

@@ -39,7 +39,6 @@ sbin/mkfs
sbin/mkfs.minix
sbin/mkswap
#sbin/pivot_root
sbin/raw
sbin/sfdisk
sbin/swaplabel
sbin/swapoff

File diff suppressed because it is too large Load Diff

View File

@@ -69,7 +69,6 @@
#usr/include/asm/termbits.h
#usr/include/asm/termios.h
#usr/include/asm/types.h
#usr/include/asm/unistd-common.h
#usr/include/asm/unistd-eabi.h
#usr/include/asm/unistd-oabi.h
#usr/include/asm/unistd.h
@@ -104,6 +103,7 @@
#usr/include/drm/vmwgfx_drm.h
#usr/include/linux
#usr/include/linux/acct.h
#usr/include/linux/acrn.h
#usr/include/linux/adb.h
#usr/include/linux/adfs_fs.h
#usr/include/linux/affs_hardblocks.h
@@ -183,13 +183,16 @@
#usr/include/linux/capi.h
#usr/include/linux/cciss_defs.h
#usr/include/linux/cciss_ioctl.h
#usr/include/linux/ccs.h
#usr/include/linux/cdrom.h
#usr/include/linux/cec-funcs.h
#usr/include/linux/cec.h
#usr/include/linux/cfm_bridge.h
#usr/include/linux/cgroupstats.h
#usr/include/linux/chio.h
#usr/include/linux/cifs
#usr/include/linux/cifs/cifs_mount.h
#usr/include/linux/cifs/cifs_netlink.h
#usr/include/linux/close_range.h
#usr/include/linux/cm4000_cs.h
#usr/include/linux/cn_proc.h
@@ -201,7 +204,7 @@
#usr/include/linux/cramfs_fs.h
#usr/include/linux/cryptouser.h
#usr/include/linux/cuda.h
#usr/include/linux/cyclades.h
#usr/include/linux/cxl_mem.h
#usr/include/linux/cycx_cfm.h
#usr/include/linux/dcbnl.h
#usr/include/linux/dccp.h
@@ -257,6 +260,7 @@
#usr/include/linux/fscrypt.h
#usr/include/linux/fsi.h
#usr/include/linux/fsl_hypervisor.h
#usr/include/linux/fsl_mc.h
#usr/include/linux/fsmap.h
#usr/include/linux/fsverity.h
#usr/include/linux/fuse.h
@@ -306,7 +310,6 @@
#usr/include/linux/if_ether.h
#usr/include/linux/if_fc.h
#usr/include/linux/if_fddi.h
#usr/include/linux/if_frad.h
#usr/include/linux/if_hippi.h
#usr/include/linux/if_infiniband.h
#usr/include/linux/if_link.h
@@ -328,6 +331,7 @@
#usr/include/linux/ife.h
#usr/include/linux/igmp.h
#usr/include/linux/iio
#usr/include/linux/iio/buffer.h
#usr/include/linux/iio/events.h
#usr/include/linux/iio/types.h
#usr/include/linux/ila.h
@@ -339,8 +343,12 @@
#usr/include/linux/input-event-codes.h
#usr/include/linux/input.h
#usr/include/linux/io_uring.h
#usr/include/linux/ioam6.h
#usr/include/linux/ioam6_genl.h
#usr/include/linux/ioam6_iptunnel.h
#usr/include/linux/ioctl.h
#usr/include/linux/iommu.h
#usr/include/linux/ioprio.h
#usr/include/linux/ip.h
#usr/include/linux/ip6_tunnel.h
#usr/include/linux/ip_vs.h
@@ -351,7 +359,6 @@
#usr/include/linux/ipsec.h
#usr/include/linux/ipv6.h
#usr/include/linux/ipv6_route.h
#usr/include/linux/ipx.h
#usr/include/linux/irqnr.h
#usr/include/linux/isdn
#usr/include/linux/isdn/capicmd.h
@@ -375,8 +382,8 @@
#usr/include/linux/kfd_ioctl.h
#usr/include/linux/kvm_para.h
#usr/include/linux/l2tp.h
#usr/include/linux/landlock.h
#usr/include/linux/libc-compat.h
#usr/include/linux/lightnvm.h
#usr/include/linux/limits.h
#usr/include/linux/lirc.h
#usr/include/linux/llc.h
@@ -388,6 +395,7 @@
#usr/include/linux/map_to_7segment.h
#usr/include/linux/matroxfb.h
#usr/include/linux/max2175.h
#usr/include/linux/mctp.h
#usr/include/linux/mdio.h
#usr/include/linux/media-bus-format.h
#usr/include/linux/media.h
@@ -398,6 +406,8 @@
#usr/include/linux/meye.h
#usr/include/linux/mii.h
#usr/include/linux/minix_fs.h
#usr/include/linux/misc
#usr/include/linux/misc/bcm_vk.h
#usr/include/linux/mman.h
#usr/include/linux/mmc
#usr/include/linux/mmc/ioctl.h
@@ -414,7 +424,6 @@
#usr/include/linux/msdos_fs.h
#usr/include/linux/msg.h
#usr/include/linux/mtio.h
#usr/include/linux/n_r3964.h
#usr/include/linux/nbd-netlink.h
#usr/include/linux/nbd.h
#usr/include/linux/ncsi.h
@@ -449,6 +458,7 @@
#usr/include/linux/netfilter/nfnetlink_conntrack.h
#usr/include/linux/netfilter/nfnetlink_cthelper.h
#usr/include/linux/netfilter/nfnetlink_cttimeout.h
#usr/include/linux/netfilter/nfnetlink_hook.h
#usr/include/linux/netfilter/nfnetlink_log.h
#usr/include/linux/netfilter/nfnetlink_osf.h
#usr/include/linux/netfilter/nfnetlink_queue.h
@@ -596,6 +606,7 @@
#usr/include/linux/nilfs2_api.h
#usr/include/linux/nilfs2_ondisk.h
#usr/include/linux/nitro_enclaves.h
#usr/include/linux/nl80211-vnd-intel.h
#usr/include/linux/nl80211.h
#usr/include/linux/nsfs.h
#usr/include/linux/nubus.h
@@ -650,7 +661,6 @@
#usr/include/linux/raid/md_p.h
#usr/include/linux/raid/md_u.h
#usr/include/linux/random.h
#usr/include/linux/raw.h
#usr/include/linux/rds.h
#usr/include/linux/reboot.h
#usr/include/linux/reiserfs_fs.h
@@ -660,12 +670,14 @@
#usr/include/linux/rfkill.h
#usr/include/linux/rio_cm_cdev.h
#usr/include/linux/rio_mport_cdev.h
#usr/include/linux/rkisp1-config.h
#usr/include/linux/romfs_fs.h
#usr/include/linux/rose.h
#usr/include/linux/route.h
#usr/include/linux/rpl.h
#usr/include/linux/rpl_iptunnel.h
#usr/include/linux/rpmsg.h
#usr/include/linux/rpmsg_types.h
#usr/include/linux/rseq.h
#usr/include/linux/rtc.h
#usr/include/linux/rtnetlink.h
@@ -677,7 +689,6 @@
#usr/include/linux/scif_ioctl.h
#usr/include/linux/screen_info.h
#usr/include/linux/sctp.h
#usr/include/linux/sdla.h
#usr/include/linux/seccomp.h
#usr/include/linux/securebits.h
#usr/include/linux/sed-opal.h
@@ -707,6 +718,7 @@
#usr/include/linux/sound.h
#usr/include/linux/soundcard.h
#usr/include/linux/spi
#usr/include/linux/spi/spi.h
#usr/include/linux/spi/spidev.h
#usr/include/linux/stat.h
#usr/include/linux/stddef.h
@@ -714,6 +726,9 @@
#usr/include/linux/string.h
#usr/include/linux/sunrpc
#usr/include/linux/sunrpc/debug.h
#usr/include/linux/surface_aggregator
#usr/include/linux/surface_aggregator/cdev.h
#usr/include/linux/surface_aggregator/dtx.h
#usr/include/linux/suspend_ioctls.h
#usr/include/linux/swab.h
#usr/include/linux/switchtec_ioctl.h
@@ -812,6 +827,8 @@
#usr/include/linux/vbox_err.h
#usr/include/linux/vbox_vmmdev_types.h
#usr/include/linux/vboxguest.h
#usr/include/linux/vdpa.h
#usr/include/linux/vduse.h
#usr/include/linux/version.h
#usr/include/linux/veth.h
#usr/include/linux/vfio.h
@@ -823,11 +840,14 @@
#usr/include/linux/virtio_9p.h
#usr/include/linux/virtio_balloon.h
#usr/include/linux/virtio_blk.h
#usr/include/linux/virtio_bt.h
#usr/include/linux/virtio_config.h
#usr/include/linux/virtio_console.h
#usr/include/linux/virtio_crypto.h
#usr/include/linux/virtio_fs.h
#usr/include/linux/virtio_gpio.h
#usr/include/linux/virtio_gpu.h
#usr/include/linux/virtio_i2c.h
#usr/include/linux/virtio_ids.h
#usr/include/linux/virtio_input.h
#usr/include/linux/virtio_iommu.h
@@ -835,10 +855,13 @@
#usr/include/linux/virtio_mmio.h
#usr/include/linux/virtio_net.h
#usr/include/linux/virtio_pci.h
#usr/include/linux/virtio_pcidev.h
#usr/include/linux/virtio_pmem.h
#usr/include/linux/virtio_ring.h
#usr/include/linux/virtio_rng.h
#usr/include/linux/virtio_scmi.h
#usr/include/linux/virtio_scsi.h
#usr/include/linux/virtio_snd.h
#usr/include/linux/virtio_types.h
#usr/include/linux/virtio_vsock.h
#usr/include/linux/vm_sockets.h
@@ -850,12 +873,10 @@
#usr/include/linux/wait.h
#usr/include/linux/watch_queue.h
#usr/include/linux/watchdog.h
#usr/include/linux/wimax
#usr/include/linux/wimax.h
#usr/include/linux/wimax/i2400m.h
#usr/include/linux/wireguard.h
#usr/include/linux/wireless.h
#usr/include/linux/wmi.h
#usr/include/linux/wwan.h
#usr/include/linux/x25.h
#usr/include/linux/xattr.h
#usr/include/linux/xdp_diag.h
@@ -887,12 +908,12 @@
#usr/include/rdma/hfi/hfi1_ioctl.h
#usr/include/rdma/hfi/hfi1_user.h
#usr/include/rdma/hns-abi.h
#usr/include/rdma/i40iw-abi.h
#usr/include/rdma/ib_user_ioctl_cmds.h
#usr/include/rdma/ib_user_ioctl_verbs.h
#usr/include/rdma/ib_user_mad.h
#usr/include/rdma/ib_user_sa.h
#usr/include/rdma/ib_user_verbs.h
#usr/include/rdma/irdma-abi.h
#usr/include/rdma/mlx4-abi.h
#usr/include/rdma/mlx5-abi.h
#usr/include/rdma/mlx5_user_ioctl_cmds.h

View File

@@ -39,7 +39,6 @@ sbin/mkfs
sbin/mkfs.minix
sbin/mkswap
#sbin/pivot_root
sbin/raw
sbin/sfdisk
sbin/swaplabel
sbin/swapoff

File diff suppressed because it is too large Load Diff

View File

@@ -76,6 +76,7 @@
#usr/include/asm/resource.h
#usr/include/asm/sembuf.h
#usr/include/asm/setup.h
#usr/include/asm/sgx.h
#usr/include/asm/shmbuf.h
#usr/include/asm/sigcontext.h
#usr/include/asm/sigcontext32.h
@@ -130,6 +131,7 @@
#usr/include/linux
#usr/include/linux/a.out.h
#usr/include/linux/acct.h
#usr/include/linux/acrn.h
#usr/include/linux/adb.h
#usr/include/linux/adfs_fs.h
#usr/include/linux/affs_hardblocks.h
@@ -209,13 +211,16 @@
#usr/include/linux/capi.h
#usr/include/linux/cciss_defs.h
#usr/include/linux/cciss_ioctl.h
#usr/include/linux/ccs.h
#usr/include/linux/cdrom.h
#usr/include/linux/cec-funcs.h
#usr/include/linux/cec.h
#usr/include/linux/cfm_bridge.h
#usr/include/linux/cgroupstats.h
#usr/include/linux/chio.h
#usr/include/linux/cifs
#usr/include/linux/cifs/cifs_mount.h
#usr/include/linux/cifs/cifs_netlink.h
#usr/include/linux/close_range.h
#usr/include/linux/cm4000_cs.h
#usr/include/linux/cn_proc.h
@@ -227,7 +232,7 @@
#usr/include/linux/cramfs_fs.h
#usr/include/linux/cryptouser.h
#usr/include/linux/cuda.h
#usr/include/linux/cyclades.h
#usr/include/linux/cxl_mem.h
#usr/include/linux/cycx_cfm.h
#usr/include/linux/dcbnl.h
#usr/include/linux/dccp.h
@@ -283,6 +288,7 @@
#usr/include/linux/fscrypt.h
#usr/include/linux/fsi.h
#usr/include/linux/fsl_hypervisor.h
#usr/include/linux/fsl_mc.h
#usr/include/linux/fsmap.h
#usr/include/linux/fsverity.h
#usr/include/linux/fuse.h
@@ -332,7 +338,6 @@
#usr/include/linux/if_ether.h
#usr/include/linux/if_fc.h
#usr/include/linux/if_fddi.h
#usr/include/linux/if_frad.h
#usr/include/linux/if_hippi.h
#usr/include/linux/if_infiniband.h
#usr/include/linux/if_link.h
@@ -354,6 +359,7 @@
#usr/include/linux/ife.h
#usr/include/linux/igmp.h
#usr/include/linux/iio
#usr/include/linux/iio/buffer.h
#usr/include/linux/iio/events.h
#usr/include/linux/iio/types.h
#usr/include/linux/ila.h
@@ -365,8 +371,12 @@
#usr/include/linux/input-event-codes.h
#usr/include/linux/input.h
#usr/include/linux/io_uring.h
#usr/include/linux/ioam6.h
#usr/include/linux/ioam6_genl.h
#usr/include/linux/ioam6_iptunnel.h
#usr/include/linux/ioctl.h
#usr/include/linux/iommu.h
#usr/include/linux/ioprio.h
#usr/include/linux/ip.h
#usr/include/linux/ip6_tunnel.h
#usr/include/linux/ip_vs.h
@@ -377,7 +387,6 @@
#usr/include/linux/ipsec.h
#usr/include/linux/ipv6.h
#usr/include/linux/ipv6_route.h
#usr/include/linux/ipx.h
#usr/include/linux/irqnr.h
#usr/include/linux/isdn
#usr/include/linux/isdn/capicmd.h
@@ -402,8 +411,8 @@
#usr/include/linux/kvm.h
#usr/include/linux/kvm_para.h
#usr/include/linux/l2tp.h
#usr/include/linux/landlock.h
#usr/include/linux/libc-compat.h
#usr/include/linux/lightnvm.h
#usr/include/linux/limits.h
#usr/include/linux/lirc.h
#usr/include/linux/llc.h
@@ -415,6 +424,7 @@
#usr/include/linux/map_to_7segment.h
#usr/include/linux/matroxfb.h
#usr/include/linux/max2175.h
#usr/include/linux/mctp.h
#usr/include/linux/mdio.h
#usr/include/linux/media-bus-format.h
#usr/include/linux/media.h
@@ -425,6 +435,8 @@
#usr/include/linux/meye.h
#usr/include/linux/mii.h
#usr/include/linux/minix_fs.h
#usr/include/linux/misc
#usr/include/linux/misc/bcm_vk.h
#usr/include/linux/mman.h
#usr/include/linux/mmc
#usr/include/linux/mmc/ioctl.h
@@ -441,7 +453,6 @@
#usr/include/linux/msdos_fs.h
#usr/include/linux/msg.h
#usr/include/linux/mtio.h
#usr/include/linux/n_r3964.h
#usr/include/linux/nbd-netlink.h
#usr/include/linux/nbd.h
#usr/include/linux/ncsi.h
@@ -476,6 +487,7 @@
#usr/include/linux/netfilter/nfnetlink_conntrack.h
#usr/include/linux/netfilter/nfnetlink_cthelper.h
#usr/include/linux/netfilter/nfnetlink_cttimeout.h
#usr/include/linux/netfilter/nfnetlink_hook.h
#usr/include/linux/netfilter/nfnetlink_log.h
#usr/include/linux/netfilter/nfnetlink_osf.h
#usr/include/linux/netfilter/nfnetlink_queue.h
@@ -623,6 +635,7 @@
#usr/include/linux/nilfs2_api.h
#usr/include/linux/nilfs2_ondisk.h
#usr/include/linux/nitro_enclaves.h
#usr/include/linux/nl80211-vnd-intel.h
#usr/include/linux/nl80211.h
#usr/include/linux/nsfs.h
#usr/include/linux/nubus.h
@@ -677,7 +690,6 @@
#usr/include/linux/raid/md_p.h
#usr/include/linux/raid/md_u.h
#usr/include/linux/random.h
#usr/include/linux/raw.h
#usr/include/linux/rds.h
#usr/include/linux/reboot.h
#usr/include/linux/reiserfs_fs.h
@@ -687,12 +699,14 @@
#usr/include/linux/rfkill.h
#usr/include/linux/rio_cm_cdev.h
#usr/include/linux/rio_mport_cdev.h
#usr/include/linux/rkisp1-config.h
#usr/include/linux/romfs_fs.h
#usr/include/linux/rose.h
#usr/include/linux/route.h
#usr/include/linux/rpl.h
#usr/include/linux/rpl_iptunnel.h
#usr/include/linux/rpmsg.h
#usr/include/linux/rpmsg_types.h
#usr/include/linux/rseq.h
#usr/include/linux/rtc.h
#usr/include/linux/rtnetlink.h
@@ -704,7 +718,6 @@
#usr/include/linux/scif_ioctl.h
#usr/include/linux/screen_info.h
#usr/include/linux/sctp.h
#usr/include/linux/sdla.h
#usr/include/linux/seccomp.h
#usr/include/linux/securebits.h
#usr/include/linux/sed-opal.h
@@ -734,6 +747,7 @@
#usr/include/linux/sound.h
#usr/include/linux/soundcard.h
#usr/include/linux/spi
#usr/include/linux/spi/spi.h
#usr/include/linux/spi/spidev.h
#usr/include/linux/stat.h
#usr/include/linux/stddef.h
@@ -741,6 +755,9 @@
#usr/include/linux/string.h
#usr/include/linux/sunrpc
#usr/include/linux/sunrpc/debug.h
#usr/include/linux/surface_aggregator
#usr/include/linux/surface_aggregator/cdev.h
#usr/include/linux/surface_aggregator/dtx.h
#usr/include/linux/suspend_ioctls.h
#usr/include/linux/swab.h
#usr/include/linux/switchtec_ioctl.h
@@ -839,6 +856,8 @@
#usr/include/linux/vbox_err.h
#usr/include/linux/vbox_vmmdev_types.h
#usr/include/linux/vboxguest.h
#usr/include/linux/vdpa.h
#usr/include/linux/vduse.h
#usr/include/linux/version.h
#usr/include/linux/veth.h
#usr/include/linux/vfio.h
@@ -850,11 +869,14 @@
#usr/include/linux/virtio_9p.h
#usr/include/linux/virtio_balloon.h
#usr/include/linux/virtio_blk.h
#usr/include/linux/virtio_bt.h
#usr/include/linux/virtio_config.h
#usr/include/linux/virtio_console.h
#usr/include/linux/virtio_crypto.h
#usr/include/linux/virtio_fs.h
#usr/include/linux/virtio_gpio.h
#usr/include/linux/virtio_gpu.h
#usr/include/linux/virtio_i2c.h
#usr/include/linux/virtio_ids.h
#usr/include/linux/virtio_input.h
#usr/include/linux/virtio_iommu.h
@@ -862,10 +884,13 @@
#usr/include/linux/virtio_mmio.h
#usr/include/linux/virtio_net.h
#usr/include/linux/virtio_pci.h
#usr/include/linux/virtio_pcidev.h
#usr/include/linux/virtio_pmem.h
#usr/include/linux/virtio_ring.h
#usr/include/linux/virtio_rng.h
#usr/include/linux/virtio_scmi.h
#usr/include/linux/virtio_scsi.h
#usr/include/linux/virtio_snd.h
#usr/include/linux/virtio_types.h
#usr/include/linux/virtio_vsock.h
#usr/include/linux/vm_sockets.h
@@ -877,12 +902,10 @@
#usr/include/linux/wait.h
#usr/include/linux/watch_queue.h
#usr/include/linux/watchdog.h
#usr/include/linux/wimax
#usr/include/linux/wimax.h
#usr/include/linux/wimax/i2400m.h
#usr/include/linux/wireguard.h
#usr/include/linux/wireless.h
#usr/include/linux/wmi.h
#usr/include/linux/wwan.h
#usr/include/linux/x25.h
#usr/include/linux/xattr.h
#usr/include/linux/xdp_diag.h
@@ -914,12 +937,12 @@
#usr/include/rdma/hfi/hfi1_ioctl.h
#usr/include/rdma/hfi/hfi1_user.h
#usr/include/rdma/hns-abi.h
#usr/include/rdma/i40iw-abi.h
#usr/include/rdma/ib_user_ioctl_cmds.h
#usr/include/rdma/ib_user_ioctl_verbs.h
#usr/include/rdma/ib_user_mad.h
#usr/include/rdma/ib_user_sa.h
#usr/include/rdma/ib_user_verbs.h
#usr/include/rdma/irdma-abi.h
#usr/include/rdma/mlx4-abi.h
#usr/include/rdma/mlx5-abi.h
#usr/include/rdma/mlx5_user_ioctl_cmds.h

View File

@@ -39,7 +39,6 @@ sbin/mkfs
sbin/mkfs.minix
sbin/mkswap
#sbin/pivot_root
sbin/raw
sbin/sfdisk
sbin/swaplabel
sbin/swapoff

File diff suppressed because it is too large Load Diff

View File

@@ -76,6 +76,7 @@
#usr/include/asm/resource.h
#usr/include/asm/sembuf.h
#usr/include/asm/setup.h
#usr/include/asm/sgx.h
#usr/include/asm/shmbuf.h
#usr/include/asm/sigcontext.h
#usr/include/asm/sigcontext32.h
@@ -130,6 +131,7 @@
#usr/include/linux
#usr/include/linux/a.out.h
#usr/include/linux/acct.h
#usr/include/linux/acrn.h
#usr/include/linux/adb.h
#usr/include/linux/adfs_fs.h
#usr/include/linux/affs_hardblocks.h
@@ -209,13 +211,16 @@
#usr/include/linux/capi.h
#usr/include/linux/cciss_defs.h
#usr/include/linux/cciss_ioctl.h
#usr/include/linux/ccs.h
#usr/include/linux/cdrom.h
#usr/include/linux/cec-funcs.h
#usr/include/linux/cec.h
#usr/include/linux/cfm_bridge.h
#usr/include/linux/cgroupstats.h
#usr/include/linux/chio.h
#usr/include/linux/cifs
#usr/include/linux/cifs/cifs_mount.h
#usr/include/linux/cifs/cifs_netlink.h
#usr/include/linux/close_range.h
#usr/include/linux/cm4000_cs.h
#usr/include/linux/cn_proc.h
@@ -227,7 +232,7 @@
#usr/include/linux/cramfs_fs.h
#usr/include/linux/cryptouser.h
#usr/include/linux/cuda.h
#usr/include/linux/cyclades.h
#usr/include/linux/cxl_mem.h
#usr/include/linux/cycx_cfm.h
#usr/include/linux/dcbnl.h
#usr/include/linux/dccp.h
@@ -283,6 +288,7 @@
#usr/include/linux/fscrypt.h
#usr/include/linux/fsi.h
#usr/include/linux/fsl_hypervisor.h
#usr/include/linux/fsl_mc.h
#usr/include/linux/fsmap.h
#usr/include/linux/fsverity.h
#usr/include/linux/fuse.h
@@ -332,7 +338,6 @@
#usr/include/linux/if_ether.h
#usr/include/linux/if_fc.h
#usr/include/linux/if_fddi.h
#usr/include/linux/if_frad.h
#usr/include/linux/if_hippi.h
#usr/include/linux/if_infiniband.h
#usr/include/linux/if_link.h
@@ -354,6 +359,7 @@
#usr/include/linux/ife.h
#usr/include/linux/igmp.h
#usr/include/linux/iio
#usr/include/linux/iio/buffer.h
#usr/include/linux/iio/events.h
#usr/include/linux/iio/types.h
#usr/include/linux/ila.h
@@ -365,8 +371,12 @@
#usr/include/linux/input-event-codes.h
#usr/include/linux/input.h
#usr/include/linux/io_uring.h
#usr/include/linux/ioam6.h
#usr/include/linux/ioam6_genl.h
#usr/include/linux/ioam6_iptunnel.h
#usr/include/linux/ioctl.h
#usr/include/linux/iommu.h
#usr/include/linux/ioprio.h
#usr/include/linux/ip.h
#usr/include/linux/ip6_tunnel.h
#usr/include/linux/ip_vs.h
@@ -377,7 +387,6 @@
#usr/include/linux/ipsec.h
#usr/include/linux/ipv6.h
#usr/include/linux/ipv6_route.h
#usr/include/linux/ipx.h
#usr/include/linux/irqnr.h
#usr/include/linux/isdn
#usr/include/linux/isdn/capicmd.h
@@ -402,8 +411,8 @@
#usr/include/linux/kvm.h
#usr/include/linux/kvm_para.h
#usr/include/linux/l2tp.h
#usr/include/linux/landlock.h
#usr/include/linux/libc-compat.h
#usr/include/linux/lightnvm.h
#usr/include/linux/limits.h
#usr/include/linux/lirc.h
#usr/include/linux/llc.h
@@ -415,6 +424,7 @@
#usr/include/linux/map_to_7segment.h
#usr/include/linux/matroxfb.h
#usr/include/linux/max2175.h
#usr/include/linux/mctp.h
#usr/include/linux/mdio.h
#usr/include/linux/media-bus-format.h
#usr/include/linux/media.h
@@ -425,6 +435,8 @@
#usr/include/linux/meye.h
#usr/include/linux/mii.h
#usr/include/linux/minix_fs.h
#usr/include/linux/misc
#usr/include/linux/misc/bcm_vk.h
#usr/include/linux/mman.h
#usr/include/linux/mmc
#usr/include/linux/mmc/ioctl.h
@@ -441,7 +453,6 @@
#usr/include/linux/msdos_fs.h
#usr/include/linux/msg.h
#usr/include/linux/mtio.h
#usr/include/linux/n_r3964.h
#usr/include/linux/nbd-netlink.h
#usr/include/linux/nbd.h
#usr/include/linux/ncsi.h
@@ -476,6 +487,7 @@
#usr/include/linux/netfilter/nfnetlink_conntrack.h
#usr/include/linux/netfilter/nfnetlink_cthelper.h
#usr/include/linux/netfilter/nfnetlink_cttimeout.h
#usr/include/linux/netfilter/nfnetlink_hook.h
#usr/include/linux/netfilter/nfnetlink_log.h
#usr/include/linux/netfilter/nfnetlink_osf.h
#usr/include/linux/netfilter/nfnetlink_queue.h
@@ -623,6 +635,7 @@
#usr/include/linux/nilfs2_api.h
#usr/include/linux/nilfs2_ondisk.h
#usr/include/linux/nitro_enclaves.h
#usr/include/linux/nl80211-vnd-intel.h
#usr/include/linux/nl80211.h
#usr/include/linux/nsfs.h
#usr/include/linux/nubus.h
@@ -677,7 +690,6 @@
#usr/include/linux/raid/md_p.h
#usr/include/linux/raid/md_u.h
#usr/include/linux/random.h
#usr/include/linux/raw.h
#usr/include/linux/rds.h
#usr/include/linux/reboot.h
#usr/include/linux/reiserfs_fs.h
@@ -687,12 +699,14 @@
#usr/include/linux/rfkill.h
#usr/include/linux/rio_cm_cdev.h
#usr/include/linux/rio_mport_cdev.h
#usr/include/linux/rkisp1-config.h
#usr/include/linux/romfs_fs.h
#usr/include/linux/rose.h
#usr/include/linux/route.h
#usr/include/linux/rpl.h
#usr/include/linux/rpl_iptunnel.h
#usr/include/linux/rpmsg.h
#usr/include/linux/rpmsg_types.h
#usr/include/linux/rseq.h
#usr/include/linux/rtc.h
#usr/include/linux/rtnetlink.h
@@ -704,7 +718,6 @@
#usr/include/linux/scif_ioctl.h
#usr/include/linux/screen_info.h
#usr/include/linux/sctp.h
#usr/include/linux/sdla.h
#usr/include/linux/seccomp.h
#usr/include/linux/securebits.h
#usr/include/linux/sed-opal.h
@@ -734,6 +747,7 @@
#usr/include/linux/sound.h
#usr/include/linux/soundcard.h
#usr/include/linux/spi
#usr/include/linux/spi/spi.h
#usr/include/linux/spi/spidev.h
#usr/include/linux/stat.h
#usr/include/linux/stddef.h
@@ -741,6 +755,9 @@
#usr/include/linux/string.h
#usr/include/linux/sunrpc
#usr/include/linux/sunrpc/debug.h
#usr/include/linux/surface_aggregator
#usr/include/linux/surface_aggregator/cdev.h
#usr/include/linux/surface_aggregator/dtx.h
#usr/include/linux/suspend_ioctls.h
#usr/include/linux/swab.h
#usr/include/linux/switchtec_ioctl.h
@@ -839,6 +856,8 @@
#usr/include/linux/vbox_err.h
#usr/include/linux/vbox_vmmdev_types.h
#usr/include/linux/vboxguest.h
#usr/include/linux/vdpa.h
#usr/include/linux/vduse.h
#usr/include/linux/version.h
#usr/include/linux/veth.h
#usr/include/linux/vfio.h
@@ -850,11 +869,14 @@
#usr/include/linux/virtio_9p.h
#usr/include/linux/virtio_balloon.h
#usr/include/linux/virtio_blk.h
#usr/include/linux/virtio_bt.h
#usr/include/linux/virtio_config.h
#usr/include/linux/virtio_console.h
#usr/include/linux/virtio_crypto.h
#usr/include/linux/virtio_fs.h
#usr/include/linux/virtio_gpio.h
#usr/include/linux/virtio_gpu.h
#usr/include/linux/virtio_i2c.h
#usr/include/linux/virtio_ids.h
#usr/include/linux/virtio_input.h
#usr/include/linux/virtio_iommu.h
@@ -862,10 +884,13 @@
#usr/include/linux/virtio_mmio.h
#usr/include/linux/virtio_net.h
#usr/include/linux/virtio_pci.h
#usr/include/linux/virtio_pcidev.h
#usr/include/linux/virtio_pmem.h
#usr/include/linux/virtio_ring.h
#usr/include/linux/virtio_rng.h
#usr/include/linux/virtio_scmi.h
#usr/include/linux/virtio_scsi.h
#usr/include/linux/virtio_snd.h
#usr/include/linux/virtio_types.h
#usr/include/linux/virtio_vsock.h
#usr/include/linux/vm_sockets.h
@@ -877,12 +902,10 @@
#usr/include/linux/wait.h
#usr/include/linux/watch_queue.h
#usr/include/linux/watchdog.h
#usr/include/linux/wimax
#usr/include/linux/wimax.h
#usr/include/linux/wimax/i2400m.h
#usr/include/linux/wireguard.h
#usr/include/linux/wireless.h
#usr/include/linux/wmi.h
#usr/include/linux/wwan.h
#usr/include/linux/x25.h
#usr/include/linux/xattr.h
#usr/include/linux/xdp_diag.h
@@ -914,12 +937,12 @@
#usr/include/rdma/hfi/hfi1_ioctl.h
#usr/include/rdma/hfi/hfi1_user.h
#usr/include/rdma/hns-abi.h
#usr/include/rdma/i40iw-abi.h
#usr/include/rdma/ib_user_ioctl_cmds.h
#usr/include/rdma/ib_user_ioctl_verbs.h
#usr/include/rdma/ib_user_mad.h
#usr/include/rdma/ib_user_sa.h
#usr/include/rdma/ib_user_verbs.h
#usr/include/rdma/irdma-abi.h
#usr/include/rdma/mlx4-abi.h
#usr/include/rdma/mlx5-abi.h
#usr/include/rdma/mlx5_user_ioctl_cmds.h

View File

@@ -39,7 +39,6 @@ sbin/mkfs
sbin/mkfs.minix
sbin/mkswap
#sbin/pivot_root
sbin/raw
sbin/sfdisk
sbin/swaplabel
sbin/swapoff

View File

@@ -22,8 +22,7 @@ lib/xtables/libxt_lscan.so
lib/xtables/libxt_pknock.so
lib/xtables/libxt_psd.so
lib/xtables/libxt_quota2.so
#usr/bin/xt_geoip_fetch
#usr/bin/xt_geoip_fetch_maxmind
usr/bin/xt_geoip_query
#usr/lib/libxt_ACCOUNT_cl.la
#usr/lib/libxt_ACCOUNT_cl.so
usr/lib/libxt_ACCOUNT_cl.so.0
@@ -36,9 +35,10 @@ usr/lib/libxt_ACCOUNT_cl.so.0.0.0
usr/sbin/iptaccount
usr/sbin/pknlusr
#usr/share/man/man1/xt_geoip_build.1
#usr/share/man/man1/xt_geoip_build_maxmind.1
#usr/share/man/man1/xt_geoip_dl.1
#usr/share/man/man1/xt_geoip_fetch.1
#usr/share/man/man1/xt_geoip_dl_maxmind.1
#usr/share/man/man1/xt_geoip_query.1
#usr/share/man/man8/iptaccount.8
#usr/share/man/man8/pknlusr.8
#usr/share/man/man8/xtables-addons.8
usr/share/xt_geoip

View File

@@ -0,0 +1,35 @@
boot/grub/grub.cfg
boot/grub/grubenv
boot/uEnv.txt
boot/uboot.env
etc/alternatives
etc/collectd.custom
etc/default/grub
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/localtime
etc/shadow
etc/snort/snort.conf
etc/ssl/openssl.cnf
etc/sudoers
etc/sysconfig/firewall.local
etc/sysconfig/rc.local
etc/udev/rules.d/30-persistent-network.rules
srv/web/ipfire/html/proxy.pac
usr/share/xt_geoip
var/ipfire/dma
var/ipfire/time
var/ipfire/firewall/locationblock
var/ipfire/fwhosts/customlocationgrp
var/ipfire/ovpn
var/ipfire/urlfilter/blacklist
var/ipfire/urlfilter/settings
var/lib/alternatives
var/lib/location/database.db
var/log/cache
var/log/dhcpcd.log
var/log/messages
var/state/dhcp/dhcpd.leases
var/updatecache

View File

@@ -0,0 +1 @@
../../../../common/aarch64/linux

View File

@@ -0,0 +1 @@
../../../../common/aarch64/linux-initrd

View File

@@ -0,0 +1 @@
../../../../common/armv6l/linux

View File

@@ -0,0 +1 @@
../../../../common/armv6l/linux-initrd

View File

@@ -0,0 +1,5 @@
etc/issue
etc/os-release
etc/system-release
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs

View File

@@ -0,0 +1 @@
../../../../common/i586/linux

View File

@@ -0,0 +1 @@
../../../../common/i586/linux-initrd

View File

@@ -0,0 +1 @@
../../../../common/x86_64/linux

View File

@@ -0,0 +1 @@
../../../../common/x86_64/linux-initrd

View File

@@ -0,0 +1,145 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 3 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2021 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
core=162
exit_with_error() {
# Set last succesfull installed core.
echo $(($core-1)) > /opt/pakfire/db/core/mine
# force fsck at next boot, this may fix free space on xfs
touch /forcefsck
# don't start pakfire again at error
killall -KILL pak_update
/usr/bin/logger -p syslog.emerg -t ipfire \
"core-update-${core}: $1"
exit $2
}
# Remove old core updates from pakfire cache to save space...
for (( i=1; i<=$core; i++ )); do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
KVER="xxxKVERxxx"
# Backup uEnv.txt if exist
if [ -e /boot/uEnv.txt ]; then
cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
fi
# Do some sanity checks.
case $(uname -r) in
*-ipfire*)
# Ok.
;;
*)
exit_with_error "ERROR cannot update. No IPFire Kernel." 1
;;
esac
if [ -e /boot/grub/grub.conf ]; then
exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1
fi
# Check diskspace on root
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
if [ $ROOTSPACE -lt 100000 ]; then
exit_with_error "ERROR cannot update because not enough free space on root." 2
exit 2
fi
# Remove the old kernel
#rm -rf /boot/System.map-*
#rm -rf /boot/config-*
#rm -rf /boot/ipfirerd-*
#rm -rf /boot/initramfs-*
#rm -rf /boot/vmlinuz-*
#rm -rf /boot/uImage-*-ipfire-*
#rm -rf /boot/zImage-*-ipfire-*
#rm -rf /boot/uInit-*-ipfire-*
#rm -rf /boot/dtb-*-ipfire-*
#rm -rf /lib/modules
# Stop services
# Extract files
extract_files
# Fix permissions just in case they broke again
chmod -v 755 \
/usr \
/usr/bin \
/usr/lib \
/usr/sbin \
/var \
/var/ipfire
# update linker config
ldconfig
# Update Language cache
/usr/local/bin/update-lang-cache
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
# Start services
# remove lm_sensor config after collectd was started
# to reserch sensors at next boot with updated kernel
rm -f /etc/sysconfig/lm_sensors
# Upadate Kernel version uEnv.txt
if [ -e /boot/uEnv.txt ]; then
sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
fi
# call user update script (needed for some arm boards)
if [ -e /boot/pakfire-kernel-update ]; then
/boot/pakfire-kernel-update ${KVER}
fi
# This update needs a reboot...
touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
sendprofile
# Install updated grub
/usr/bin/install-bootloader
# Update grub config to display new core version
if [ -e /boot/grub/grub.cfg ]; then
grub-mkconfig -o /boot/grub/grub.cfg
fi
sync
# Don't report the exitcode last command
exit 0
# Stop services

View File

@@ -236,6 +236,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc.git-745dae5-remove_cyclades.patch
@mkdir $(DIR_SRC)/gcc-build
cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in

View File

@@ -34,6 +34,8 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = keepalived
PAK_VER = 9
SUP_ARCH = none
DEPS =
###############################################################################

View File

@@ -24,8 +24,8 @@
include Config
VER = 5.10.76
ARM_PATCHES = 5.10.76-ipfire1
VER = 5.15.3
ARM_PATCHES = 5.15-ipfire2
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -77,8 +77,8 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
$(DL_FILE)_MD5 = 6d9d29908d48ffee0daab4f6f8d98a65
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 02a75302a5b4a157e3d67ae62af6b178
$(DL_FILE)_MD5 = 3a96b55f9996f442da3fd165d01acefe
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 9cab549a71b19b07e0c5c103ccf3c321
install : $(TARGET)
@@ -114,7 +114,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -svf linux-$(VER) $(DIR_SRC)/linux
# Layer7-patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.10-layer7.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.15-layer7.patch
# DVB Patches
cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
@@ -123,9 +123,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14_ath_user_regd.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
# Fix apu1 led detection with newer bios versions
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.10.16-apu1-led-new-bios.patch
# Fix igb and e1000e crash
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.1-igb-e1000e_fix_lock_at_update_stats.patch
@@ -138,9 +135,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# fix Boot with enabled usercopy hardening
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.9-crypto_testmgr_allocate_buffers_with____GFP_COMP.patch
# fix gcc plugins with gcc11
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.10.45-fix_gcc_plugins_with_gcc11.patch
ifeq "$(BUILD_ARCH)" "armv6l"
# Apply Arm-multiarch kernel patches.
cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1

View File

@@ -76,6 +76,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8189es/remove-ipx.patch
cd $(DIR_APP) && CONFIG_RTL8189ES=m make $(MAKETUNING) \
-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules

View File

@@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/enable_usbmodeswitch.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/remove-ipx.patch
cd $(DIR_APP) && CONFIG_88XXAU=m make $(MAKETUNING) \
-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules

View File

@@ -76,6 +76,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8822bu/remove-ipx.patch
cd $(DIR_APP) && CONFIG_RTL8822BU=m make $(MAKETUNING) \
-C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules

View File

@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xradio/fix-transmit-of-tkip-encrypted-packets.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xradio/fix-missing-wpa1-2-sequence-numbers-for-group.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xradio/report-mic-fails-to-kernel-and-correct-iv-str.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xradio/eth_platform_get_mac_address.patch
cd $(DIR_APP) && CONFIG_WLAN_VENDOR_XRADIO=m \
make $(MAKETUNING) -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules

View File

@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/
VER = 3.13
VER = 3.18
THISAPP = xtables-addons-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 011f339ee2b3f13297c45b02f3aec2ef
$(DL_FILE)_MD5 = 755471b1dc6808f274f914fa11552698
install : $(TARGET)
@@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
# Only build the specified modules.
cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
$(DIR_APP)/mconfig
# cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
# $(DIR_APP)/mconfig
# Check if we build the modules for a kernel or the userspace parts.
ifeq "$(USPACE)" "1"

View File

@@ -0,0 +1,123 @@
From 745dae5923aba02982563481d75a21595df22ff8 Mon Sep 17 00:00:00 2001
From: Tamar Christina <tamar.christina@arm.com>
Date: Fri, 21 May 2021 10:30:59 +0100
Subject: [PATCH] libsanitizer: Remove cyclades from libsanitizer
The Linux kernel has removed the interface to cyclades from
the latest kernel headers[1] due to them being orphaned for the
past 13 years.
libsanitizer uses this header when compiling against glibc, but
glibcs itself doesn't seem to have any references to cyclades.
Further more it seems that the driver is broken in the kernel and
the firmware doesn't seem to be available anymore.
As such since this is breaking the build of libsanitizer (and so the
GCC bootstrap[2]) I propose to remove this.
[1] https://lkml.org/lkml/2021/3/2/153
[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379
(cherry picked from commit f7c5351552387bd43f6ca3631016d7f0dfe0f135)
libsanitizer/ChangeLog:
PR sanitizer/100379
* sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry-pick
llvm-project revision f7c5351552387bd43f6ca3631016d7f0dfe0f135.
* sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise.
* sanitizer_common/sanitizer_platform_limits_posix.h: Likewise.
---
.../sanitizer_common_interceptors_ioctl.inc | 9 ---------
.../sanitizer_platform_limits_posix.cpp | 11 -----------
.../sanitizer_platform_limits_posix.h | 10 ----------
3 files changed, 30 deletions(-)
diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
index 7f181258eab..b7da6598755 100644
--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
@@ -370,15 +370,6 @@ static void ioctl_table_fill() {
#if SANITIZER_GLIBC
// _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
- _(CYGETTHRESH, WRITE, sizeof(int));
- _(CYGETTIMEOUT, WRITE, sizeof(int));
- _(CYSETDEFTHRESH, NONE, 0);
- _(CYSETDEFTIMEOUT, NONE, 0);
- _(CYSETTHRESH, NONE, 0);
- _(CYSETTIMEOUT, NONE, 0);
_(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
_(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
_(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
index 35a690cba5c..6e5c330b98e 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;
# include <sys/procfs.h>
#endif
#include <sys/user.h>
-#include <linux/cyclades.h>
#include <linux/if_eql.h>
#include <linux/if_plip.h>
#include <linux/lp.h>
@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
#if SANITIZER_GLIBC
unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
#if EV_VERSION > (0x010000)
unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
#else
@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
#endif // SANITIZER_LINUX
#if SANITIZER_LINUX && !SANITIZER_ANDROID
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index ad358eef8b7..cba41ba5494 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;
#if SANITIZER_LINUX && !SANITIZER_ANDROID
extern unsigned struct_ax25_parms_struct_sz;
-extern unsigned struct_cyclades_monitor_sz;
extern unsigned struct_input_keymap_entry_sz;
extern unsigned struct_ipx_config_data_sz;
extern unsigned struct_kbdiacrs_sz;
@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
#endif // SANITIZER_LINUX
#if SANITIZER_LINUX && !SANITIZER_ANDROID
-extern unsigned IOCTL_CYGETDEFTHRESH;
-extern unsigned IOCTL_CYGETDEFTIMEOUT;
-extern unsigned IOCTL_CYGETMON;
-extern unsigned IOCTL_CYGETTHRESH;
-extern unsigned IOCTL_CYGETTIMEOUT;
-extern unsigned IOCTL_CYSETDEFTHRESH;
-extern unsigned IOCTL_CYSETDEFTIMEOUT;
-extern unsigned IOCTL_CYSETTHRESH;
-extern unsigned IOCTL_CYSETTIMEOUT;
extern unsigned IOCTL_EQL_EMANCIPATE;
extern unsigned IOCTL_EQL_ENSLAVE;
extern unsigned IOCTL_EQL_GETMASTRCFG;
--
2.27.0

View File

@@ -1,27 +0,0 @@
diff -Naur linux-5.10.16.org/drivers/leds/leds-apu.c linux-5.10.16/drivers/leds/leds-apu.c
--- linux-5.10.16.org/drivers/leds/leds-apu.c 2021-02-13 13:55:19.000000000 +0100
+++ linux-5.10.16/drivers/leds/leds-apu.c 2021-02-17 09:32:19.154531597 +0100
@@ -90,6 +90,13 @@
DMI_MATCH(DMI_PRODUCT_NAME, "APU")
}
},
+ {
+ .ident = "apu",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "apu1")
+ }
+ },
{}
};
MODULE_DEVICE_TABLE(dmi, apu_led_dmi_table);
@@ -173,7 +180,8 @@
int err;
if (!(dmi_match(DMI_SYS_VENDOR, "PC Engines") &&
- dmi_match(DMI_PRODUCT_NAME, "APU"))) {
+ dmi_match(DMI_PRODUCT_NAME, "APU")||
+ dmi_match(DMI_PRODUCT_NAME, "apu1"))) {
pr_err("No PC Engines APUv1 board detected. For APUv2,3 support, enable CONFIG_PCENGINES_APU2\n");
return -ENODEV;
}

View File

@@ -1,27 +0,0 @@
diff -Naur linux-5.10.45.org/scripts/gcc-plugins/Makefile linux-5.10.45/scripts/gcc-plugins/Makefile
--- linux-5.10.45.org/scripts/gcc-plugins/Makefile 2021-06-18 10:00:06.000000000 +0200
+++ linux-5.10.45/scripts/gcc-plugins/Makefile 2021-06-22 13:36:30.108527243 +0200
@@ -22,9 +22,9 @@
GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)
plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \
- -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++98 \
+ -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \
-fno-rtti -fno-exceptions -fasynchronous-unwind-tables \
- -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \
+ -ggdb -Wno-narrowing -Wno-unused-variable \
-Wno-format-diag
plugin_ldflags = -shared
diff -Naur linux-5.10.45.org/scripts/gcc-plugin.sh linux-5.10.45/scripts/gcc-plugin.sh
--- linux-5.10.45.org/scripts/gcc-plugin.sh 2021-06-18 10:00:06.000000000 +0200
+++ linux-5.10.45/scripts/gcc-plugin.sh 2021-06-22 17:24:20.138602697 +0200
@@ -8,7 +8,7 @@
gccplugins_dir=$($* -print-file-name=plugin)
# we need a c++ compiler that supports the designated initializer GNU extension
-$HOSTCC -c -x c++ -std=gnu++98 - -fsyntax-only -I $srctree/gcc-plugins -I $gccplugins_dir/include 2>/dev/null <<EOF
+$HOSTCC -c -x c++ -std=gnu++11 - -fsyntax-only -I $srctree/gcc-plugins -I $gccplugins_dir/include 2>/dev/null <<EOF
#include "gcc-common.h"
class test {
public:

View File

@@ -1,8 +1,8 @@
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index a828cf99c521..6d97e4d8623f 100644
index 841e2f0f5240..636e5abedb08 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -757,6 +757,9 @@ struct sk_buff {
@@ -768,6 +768,9 @@ struct sk_buff {
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
unsigned long _nfct;
@@ -13,10 +13,10 @@ index a828cf99c521..6d97e4d8623f 100644
unsigned int len,
data_len;
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 439379ca9ffa..9cab502ff226 100644
index cc663c68ddc4..55655f5ee4f2 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -103,6 +103,23 @@ struct nf_conn {
@@ -117,6 +117,23 @@ struct nf_conn {
/* Extensions */
struct nf_ct_ext *ext;
@@ -60,10 +60,10 @@ index 000000000000..147cd6477858
+
+#endif /* _XT_LAYER7_H */
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 52370211e46b..734b4d641469 100644
index 92a747896f80..0152bdbc338e 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -1355,6 +1355,26 @@ config NETFILTER_XT_MATCH_L2TP
@@ -1389,6 +1389,26 @@ config NETFILTER_XT_MATCH_L2TP
To compile it as a module, choose M here. If unsure, say N.
@@ -91,10 +91,10 @@ index 52370211e46b..734b4d641469 100644
tristate '"length" match support'
depends on NETFILTER_ADVANCED
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 0e0ded87e27b..6c383006af4e 100644
index aab20e575ecd..0dfd2c3df9e1 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -203,6 +203,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) += xt_recent.o
@@ -201,6 +201,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) += xt_recent.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@@ -103,10 +103,10 @@ index 0e0ded87e27b..6c383006af4e 100644
obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 234b7cab37c3..05731ba4f5ff 100644
index 770a63103c7a..5951aedc010a 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -617,6 +617,11 @@ destroy_conntrack(struct nf_conntrack *nfct)
@@ -636,6 +636,11 @@ destroy_conntrack(struct nf_conntrack *nfct)
*/
nf_ct_remove_expectations(ct);
@@ -119,10 +119,10 @@ index 234b7cab37c3..05731ba4f5ff 100644
local_bh_enable();
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 46c5557c1fec..6ef99967ae05 100644
index 80f675d884b2..3e7c0a85bdcf 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -366,6 +366,11 @@ static int ct_seq_show(struct seq_file *s, void *v)
@@ -370,6 +370,11 @@ static int ct_seq_show(struct seq_file *s, void *v)
ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR);
ct_show_delta_time(s, ct);

View File

@@ -0,0 +1,319 @@
diff -Naur rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e.org/core/rtw_br_ext.c rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e/core/rtw_br_ext.c
--- rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e.org/core/rtw_br_ext.c 2021-03-02 18:42:47.000000000 +0100
+++ rtl8189ES_linux-03ac413135a355b55b693154c44b70f86a39732e/core/rtw_br_ext.c 2021-11-04 18:21:00.965922215 +0100
@@ -22,7 +22,6 @@
#ifdef __KERNEL__
#include <linux/if_arp.h>
#include <net/ip.h>
-#include <net/ipx.h>
#include <linux/atalk.h>
#include <linux/udp.h>
#include <linux/if_pppox.h>
@@ -171,39 +170,6 @@
}
-static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
- unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_IPX;
- memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
- memcpy(networkAddr+5, ipxNodeAddr, 6);
-}
-
-
-static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
- unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_IPX;
- memcpy(networkAddr+1, (unsigned char *)ipxNetAddr, 4);
- memcpy(networkAddr+5, (unsigned char *)ipxSocketAddr, 2);
-}
-
-
-static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
- unsigned short *network, unsigned char *node)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_APPLE;
- memcpy(networkAddr+1, (unsigned char *)network, 2);
- networkAddr[3] = *node;
-}
-
-
static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
unsigned char *ac_mac, unsigned short *sid)
{
@@ -929,267 +895,6 @@
}
/*---------------------------------------------------*/
- /* Handle IPX and Apple Talk frame */
- /*---------------------------------------------------*/
- else if((protocol == __constant_htons(ETH_P_IPX)) ||
- (protocol == __constant_htons(ETH_P_ATALK)) ||
- (protocol == __constant_htons(ETH_P_AARP)))
- {
- unsigned char ipx_header[2] = {0xFF, 0xFF};
- struct ipxhdr *ipx = NULL;
- struct elapaarp *ea = NULL;
- struct ddpehdr *ddp = NULL;
- unsigned char *framePtr = skb->data + ETH_HLEN;
-
- if(protocol == __constant_htons(ETH_P_IPX))
- {
- DBG_871X("NAT25: Protocol=IPX (Ethernet II)\n");
- ipx = (struct ipxhdr *)framePtr;
- }
- else //if(protocol <= __constant_htons(ETH_FRAME_LEN))
- {
- if(!memcmp(ipx_header, framePtr, 2))
- {
- DBG_871X("NAT25: Protocol=IPX (Ethernet 802.3)\n");
- ipx = (struct ipxhdr *)framePtr;
- }
- else
- {
- unsigned char ipx_8022_type = 0xE0;
- unsigned char snap_8022_type = 0xAA;
-
- if(*framePtr == snap_8022_type)
- {
- unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; // IPX SNAP ID
- unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; // Apple Talk AARP SNAP ID
- unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; // Apple Talk DDP SNAP ID
-
- framePtr += 3; // eliminate the 802.2 header
-
- if(!memcmp(ipx_snap_id, framePtr, 5))
- {
- framePtr += 5; // eliminate the SNAP header
-
- DBG_871X("NAT25: Protocol=IPX (Ethernet SNAP)\n");
- ipx = (struct ipxhdr *)framePtr;
- }
- else if(!memcmp(aarp_snap_id, framePtr, 5))
- {
- framePtr += 5; // eliminate the SNAP header
-
- ea = (struct elapaarp *)framePtr;
- }
- else if(!memcmp(ddp_snap_id, framePtr, 5))
- {
- framePtr += 5; // eliminate the SNAP header
-
- ddp = (struct ddpehdr *)framePtr;
- }
- else
- {
- DEBUG_WARN("NAT25: Protocol=Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0],
- framePtr[1], framePtr[2], framePtr[3], framePtr[4]);
- return -1;
- }
- }
- else if(*framePtr == ipx_8022_type)
- {
- framePtr += 3; // eliminate the 802.2 header
-
- if(!memcmp(ipx_header, framePtr, 2))
- {
- DBG_871X("NAT25: Protocol=IPX (Ethernet 802.2)\n");
- ipx = (struct ipxhdr *)framePtr;
- }
- else
- return -1;
- }
- }
- }
-
- /* IPX */
- if(ipx != NULL)
- {
- switch(method)
- {
- case NAT25_CHECK:
- if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN))
- {
- DBG_871X("NAT25: Check IPX skb_copy\n");
- return 0;
- }
- return -1;
-
- case NAT25_INSERT:
- {
- DBG_871X("NAT25: Insert IPX, Dest=%08x,%02x%02x%02x%02x%02x%02x,%04x Source=%08x,%02x%02x%02x%02x%02x%02x,%04x\n",
- ipx->ipx_dest.net,
- ipx->ipx_dest.node[0],
- ipx->ipx_dest.node[1],
- ipx->ipx_dest.node[2],
- ipx->ipx_dest.node[3],
- ipx->ipx_dest.node[4],
- ipx->ipx_dest.node[5],
- ipx->ipx_dest.sock,
- ipx->ipx_source.net,
- ipx->ipx_source.node[0],
- ipx->ipx_source.node[1],
- ipx->ipx_source.node[2],
- ipx->ipx_source.node[3],
- ipx->ipx_source.node[4],
- ipx->ipx_source.node[5],
- ipx->ipx_source.sock);
-
- if(!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN))
- {
- DBG_871X("NAT25: Use IPX Net, and Socket as network addr\n");
-
- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock);
-
- // change IPX source node addr to wlan STA address
- memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN);
- }
- else
- {
- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node);
- }
-
- __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP:
- {
- if(!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN))
- {
- DBG_871X("NAT25: Lookup IPX, Modify Destination IPX Node addr\n");
-
- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-
- // replace IPX destination node addr with Lookup destination MAC addr
- memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN);
- }
- else
- {
- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
- }
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- /* AARP */
- else if(ea != NULL)
- {
- /* Sanity check fields. */
- if(ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN)
- {
- DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
- return -1;
- }
-
- switch(method)
- {
- case NAT25_CHECK:
- return 0;
-
- case NAT25_INSERT:
- {
- // change to AARP source mac address to wlan STA address
- memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN);
-
- DBG_871X("NAT25: Insert AARP, Source=%d,%d Destination=%d,%d\n",
- ea->pa_src_net,
- ea->pa_src_node,
- ea->pa_dst_net,
- ea->pa_dst_node);
-
- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_src_net, &ea->pa_src_node);
-
- __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP:
- {
- DBG_871X("NAT25: Lookup AARP, Source=%d,%d Destination=%d,%d\n",
- ea->pa_src_net,
- ea->pa_src_node,
- ea->pa_dst_net,
- ea->pa_dst_node);
-
- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_dst_net, &ea->pa_dst_node);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-
- // change to AARP destination mac address to Lookup result
- memcpy(ea->hw_dst, skb->data, ETH_ALEN);
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- /* DDP */
- else if(ddp != NULL)
- {
- switch(method)
- {
- case NAT25_CHECK:
- return -1;
-
- case NAT25_INSERT:
- {
- DBG_871X("NAT25: Insert DDP, Source=%d,%d Destination=%d,%d\n",
- ddp->deh_snet,
- ddp->deh_snode,
- ddp->deh_dnet,
- ddp->deh_dnode);
-
- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_snet, &ddp->deh_snode);
-
- __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP:
- {
- DBG_871X("NAT25: Lookup DDP, Source=%d,%d Destination=%d,%d\n",
- ddp->deh_snet,
- ddp->deh_snode,
- ddp->deh_dnet,
- ddp->deh_dnode);
-
- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- return -1;
- }
-
- /*---------------------------------------------------*/
/* Handle PPPoE frame */
/*---------------------------------------------------*/
else if((protocol == __constant_htons(ETH_P_PPP_DISC)) ||

View File

@@ -0,0 +1,280 @@
diff -Naur rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c.org/core/rtw_br_ext.c rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c/core/rtw_br_ext.c
--- rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c.org/core/rtw_br_ext.c 2021-05-21 22:58:44.000000000 +0200
+++ rtl8812au-0b87ed921a8682856aed5a3e68344b0087f3c93c/core/rtw_br_ext.c 2021-11-04 18:54:19.917603371 +0100
@@ -17,7 +17,6 @@
#ifdef __KERNEL__
#include <linux/if_arp.h>
#include <net/ip.h>
- #include <net/ipx.h>
#include <linux/atalk.h>
#include <linux/udp.h>
#include <linux/if_pppox.h>
@@ -168,40 +167,6 @@
memcpy(networkAddr + 7, (unsigned char *)ipAddr, 4);
}
-
-static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
- unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_IPX;
- memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
- memcpy(networkAddr + 5, ipxNodeAddr, 6);
-}
-
-
-static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
- unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_IPX;
- memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
- memcpy(networkAddr + 5, (unsigned char *)ipxSocketAddr, 2);
-}
-
-
-static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
- unsigned short *network, unsigned char *node)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_APPLE;
- memcpy(networkAddr + 1, (unsigned char *)network, 2);
- networkAddr[3] = *node;
-}
-
-
static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
unsigned char *ac_mac, unsigned short *sid)
{
@@ -890,227 +855,6 @@
}
/*---------------------------------------------------*/
- /* Handle IPX and Apple Talk frame */
- /*---------------------------------------------------*/
- else if ((protocol == __constant_htons(ETH_P_IPX)) ||
- (protocol == __constant_htons(ETH_P_ATALK)) ||
- (protocol == __constant_htons(ETH_P_AARP))) {
- unsigned char ipx_header[2] = {0xFF, 0xFF};
- struct ipxhdr *ipx = NULL;
- struct elapaarp *ea = NULL;
- struct ddpehdr *ddp = NULL;
- unsigned char *framePtr = skb->data + ETH_HLEN;
-
- if (protocol == __constant_htons(ETH_P_IPX)) {
- RTW_INFO("NAT25: Protocol=IPX (Ethernet II)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else { /* if(protocol <= __constant_htons(ETH_FRAME_LEN)) */
- if (!memcmp(ipx_header, framePtr, 2)) {
- RTW_INFO("NAT25: Protocol=IPX (Ethernet 802.3)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else {
- unsigned char ipx_8022_type = 0xE0;
- unsigned char snap_8022_type = 0xAA;
-
- if (*framePtr == snap_8022_type) {
- unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; /* IPX SNAP ID */
- unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; /* Apple Talk AARP SNAP ID */
- unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; /* Apple Talk DDP SNAP ID */
-
- framePtr += 3; /* eliminate the 802.2 header */
-
- if (!memcmp(ipx_snap_id, framePtr, 5)) {
- framePtr += 5; /* eliminate the SNAP header */
-
- RTW_INFO("NAT25: Protocol=IPX (Ethernet SNAP)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else if (!memcmp(aarp_snap_id, framePtr, 5)) {
- framePtr += 5; /* eliminate the SNAP header */
-
- ea = (struct elapaarp *)framePtr;
- } else if (!memcmp(ddp_snap_id, framePtr, 5)) {
- framePtr += 5; /* eliminate the SNAP header */
-
- ddp = (struct ddpehdr *)framePtr;
- } else {
- DEBUG_WARN("NAT25: Protocol=Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0],
- framePtr[1], framePtr[2], framePtr[3], framePtr[4]);
- return -1;
- }
- } else if (*framePtr == ipx_8022_type) {
- framePtr += 3; /* eliminate the 802.2 header */
-
- if (!memcmp(ipx_header, framePtr, 2)) {
- RTW_INFO("NAT25: Protocol=IPX (Ethernet 802.2)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else
- return -1;
- }
- }
- }
-
- /* IPX */
- if (ipx != NULL) {
- switch (method) {
- case NAT25_CHECK:
- if (!memcmp(skb->data + ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) {
- RTW_INFO("NAT25: Check IPX skb_copy\n");
- return 0;
- }
- return -1;
-
- case NAT25_INSERT: {
- RTW_INFO("NAT25: Insert IPX, Dest=%08x,%02x%02x%02x%02x%02x%02x,%04x Source=%08x,%02x%02x%02x%02x%02x%02x,%04x\n",
- ipx->ipx_dest.net,
- ipx->ipx_dest.node[0],
- ipx->ipx_dest.node[1],
- ipx->ipx_dest.node[2],
- ipx->ipx_dest.node[3],
- ipx->ipx_dest.node[4],
- ipx->ipx_dest.node[5],
- ipx->ipx_dest.sock,
- ipx->ipx_source.net,
- ipx->ipx_source.node[0],
- ipx->ipx_source.node[1],
- ipx->ipx_source.node[2],
- ipx->ipx_source.node[3],
- ipx->ipx_source.node[4],
- ipx->ipx_source.node[5],
- ipx->ipx_source.sock);
-
- if (!memcmp(skb->data + ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) {
- RTW_INFO("NAT25: Use IPX Net, and Socket as network addr\n");
-
- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock);
-
- /* change IPX source node addr to wlan STA address */
- memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN);
- } else
- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node);
-
- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP: {
- if (!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN)) {
- RTW_INFO("NAT25: Lookup IPX, Modify Destination IPX Node addr\n");
-
- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-
- /* replace IPX destination node addr with Lookup destination MAC addr */
- memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN);
- } else {
- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
- }
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- /* AARP */
- else if (ea != NULL) {
- /* Sanity check fields. */
- if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
- DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
- return -1;
- }
-
- switch (method) {
- case NAT25_CHECK:
- return 0;
-
- case NAT25_INSERT: {
- /* change to AARP source mac address to wlan STA address */
- memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN);
-
- RTW_INFO("NAT25: Insert AARP, Source=%d,%d Destination=%d,%d\n",
- ea->pa_src_net,
- ea->pa_src_node,
- ea->pa_dst_net,
- ea->pa_dst_node);
-
- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_src_net, &ea->pa_src_node);
-
- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP: {
- RTW_INFO("NAT25: Lookup AARP, Source=%d,%d Destination=%d,%d\n",
- ea->pa_src_net,
- ea->pa_src_node,
- ea->pa_dst_net,
- ea->pa_dst_node);
-
- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_dst_net, &ea->pa_dst_node);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-
- /* change to AARP destination mac address to Lookup result */
- memcpy(ea->hw_dst, skb->data, ETH_ALEN);
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- /* DDP */
- else if (ddp != NULL) {
- switch (method) {
- case NAT25_CHECK:
- return -1;
-
- case NAT25_INSERT: {
- RTW_INFO("NAT25: Insert DDP, Source=%d,%d Destination=%d,%d\n",
- ddp->deh_snet,
- ddp->deh_snode,
- ddp->deh_dnet,
- ddp->deh_dnode);
-
- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_snet, &ddp->deh_snode);
-
- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP: {
- RTW_INFO("NAT25: Lookup DDP, Source=%d,%d Destination=%d,%d\n",
- ddp->deh_snet,
- ddp->deh_snode,
- ddp->deh_dnet,
- ddp->deh_dnode);
-
- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- return -1;
- }
-
- /*---------------------------------------------------*/
/* Handle PPPoE frame */
/*---------------------------------------------------*/
else if ((protocol == __constant_htons(ETH_P_PPP_DISC)) ||

View File

@@ -0,0 +1,280 @@
diff -Naur 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082.org/core/rtw_br_ext.c 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082/core/rtw_br_ext.c
--- 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082.org/core/rtw_br_ext.c 2021-09-30 20:27:33.000000000 +0200
+++ 88x2bu-fd0b735e2e30d32f4d91497242cf6af288bdd082/core/rtw_br_ext.c 2021-11-04 18:57:11.853953556 +0100
@@ -17,7 +17,6 @@
#ifdef __KERNEL__
#include <linux/if_arp.h>
#include <net/ip.h>
- #include <net/ipx.h>
#include <linux/atalk.h>
#include <linux/udp.h>
#include <linux/if_pppox.h>
@@ -168,40 +167,6 @@
memcpy(networkAddr + 7, (unsigned char *)ipAddr, 4);
}
-
-static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
- unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_IPX;
- memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
- memcpy(networkAddr + 5, ipxNodeAddr, 6);
-}
-
-
-static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
- unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_IPX;
- memcpy(networkAddr + 1, (unsigned char *)ipxNetAddr, 4);
- memcpy(networkAddr + 5, (unsigned char *)ipxSocketAddr, 2);
-}
-
-
-static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
- unsigned short *network, unsigned char *node)
-{
- memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
-
- networkAddr[0] = NAT25_APPLE;
- memcpy(networkAddr + 1, (unsigned char *)network, 2);
- networkAddr[3] = *node;
-}
-
-
static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
unsigned char *ac_mac, unsigned short *sid)
{
@@ -890,227 +855,6 @@
}
/*---------------------------------------------------*/
- /* Handle IPX and Apple Talk frame */
- /*---------------------------------------------------*/
- else if ((protocol == __constant_htons(ETH_P_IPX)) ||
- (protocol == __constant_htons(ETH_P_ATALK)) ||
- (protocol == __constant_htons(ETH_P_AARP))) {
- unsigned char ipx_header[2] = {0xFF, 0xFF};
- struct ipxhdr *ipx = NULL;
- struct elapaarp *ea = NULL;
- struct ddpehdr *ddp = NULL;
- unsigned char *framePtr = skb->data + ETH_HLEN;
-
- if (protocol == __constant_htons(ETH_P_IPX)) {
- RTW_INFO("NAT25: Protocol=IPX (Ethernet II)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else { /* if(protocol <= __constant_htons(ETH_FRAME_LEN)) */
- if (!memcmp(ipx_header, framePtr, 2)) {
- RTW_INFO("NAT25: Protocol=IPX (Ethernet 802.3)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else {
- unsigned char ipx_8022_type = 0xE0;
- unsigned char snap_8022_type = 0xAA;
-
- if (*framePtr == snap_8022_type) {
- unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; /* IPX SNAP ID */
- unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; /* Apple Talk AARP SNAP ID */
- unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; /* Apple Talk DDP SNAP ID */
-
- framePtr += 3; /* eliminate the 802.2 header */
-
- if (!memcmp(ipx_snap_id, framePtr, 5)) {
- framePtr += 5; /* eliminate the SNAP header */
-
- RTW_INFO("NAT25: Protocol=IPX (Ethernet SNAP)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else if (!memcmp(aarp_snap_id, framePtr, 5)) {
- framePtr += 5; /* eliminate the SNAP header */
-
- ea = (struct elapaarp *)framePtr;
- } else if (!memcmp(ddp_snap_id, framePtr, 5)) {
- framePtr += 5; /* eliminate the SNAP header */
-
- ddp = (struct ddpehdr *)framePtr;
- } else {
- DEBUG_WARN("NAT25: Protocol=Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0],
- framePtr[1], framePtr[2], framePtr[3], framePtr[4]);
- return -1;
- }
- } else if (*framePtr == ipx_8022_type) {
- framePtr += 3; /* eliminate the 802.2 header */
-
- if (!memcmp(ipx_header, framePtr, 2)) {
- RTW_INFO("NAT25: Protocol=IPX (Ethernet 802.2)\n");
- ipx = (struct ipxhdr *)framePtr;
- } else
- return -1;
- }
- }
- }
-
- /* IPX */
- if (ipx != NULL) {
- switch (method) {
- case NAT25_CHECK:
- if (!memcmp(skb->data + ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) {
- RTW_INFO("NAT25: Check IPX skb_copy\n");
- return 0;
- }
- return -1;
-
- case NAT25_INSERT: {
- RTW_INFO("NAT25: Insert IPX, Dest=%08x,%02x%02x%02x%02x%02x%02x,%04x Source=%08x,%02x%02x%02x%02x%02x%02x,%04x\n",
- ipx->ipx_dest.net,
- ipx->ipx_dest.node[0],
- ipx->ipx_dest.node[1],
- ipx->ipx_dest.node[2],
- ipx->ipx_dest.node[3],
- ipx->ipx_dest.node[4],
- ipx->ipx_dest.node[5],
- ipx->ipx_dest.sock,
- ipx->ipx_source.net,
- ipx->ipx_source.node[0],
- ipx->ipx_source.node[1],
- ipx->ipx_source.node[2],
- ipx->ipx_source.node[3],
- ipx->ipx_source.node[4],
- ipx->ipx_source.node[5],
- ipx->ipx_source.sock);
-
- if (!memcmp(skb->data + ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) {
- RTW_INFO("NAT25: Use IPX Net, and Socket as network addr\n");
-
- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock);
-
- /* change IPX source node addr to wlan STA address */
- memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN);
- } else
- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node);
-
- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP: {
- if (!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN)) {
- RTW_INFO("NAT25: Lookup IPX, Modify Destination IPX Node addr\n");
-
- __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-
- /* replace IPX destination node addr with Lookup destination MAC addr */
- memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN);
- } else {
- __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
- }
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- /* AARP */
- else if (ea != NULL) {
- /* Sanity check fields. */
- if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
- DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
- return -1;
- }
-
- switch (method) {
- case NAT25_CHECK:
- return 0;
-
- case NAT25_INSERT: {
- /* change to AARP source mac address to wlan STA address */
- memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN);
-
- RTW_INFO("NAT25: Insert AARP, Source=%d,%d Destination=%d,%d\n",
- ea->pa_src_net,
- ea->pa_src_node,
- ea->pa_dst_net,
- ea->pa_dst_node);
-
- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_src_net, &ea->pa_src_node);
-
- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP: {
- RTW_INFO("NAT25: Lookup AARP, Source=%d,%d Destination=%d,%d\n",
- ea->pa_src_net,
- ea->pa_src_node,
- ea->pa_dst_net,
- ea->pa_dst_node);
-
- __nat25_generate_apple_network_addr(networkAddr, &ea->pa_dst_net, &ea->pa_dst_node);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-
- /* change to AARP destination mac address to Lookup result */
- memcpy(ea->hw_dst, skb->data, ETH_ALEN);
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- /* DDP */
- else if (ddp != NULL) {
- switch (method) {
- case NAT25_CHECK:
- return -1;
-
- case NAT25_INSERT: {
- RTW_INFO("NAT25: Insert DDP, Source=%d,%d Destination=%d,%d\n",
- ddp->deh_snet,
- ddp->deh_snode,
- ddp->deh_dnet,
- ddp->deh_dnode);
-
- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_snet, &ddp->deh_snode);
-
- __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr);
-
- __nat25_db_print(priv);
- }
- return 0;
-
- case NAT25_LOOKUP: {
- RTW_INFO("NAT25: Lookup DDP, Source=%d,%d Destination=%d,%d\n",
- ddp->deh_snet,
- ddp->deh_snode,
- ddp->deh_dnet,
- ddp->deh_dnode);
-
- __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode);
-
- __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
- }
- return 0;
-
- default:
- return -1;
- }
- }
-
- return -1;
- }
-
- /*---------------------------------------------------*/
/* Handle PPPoE frame */
/*---------------------------------------------------*/
else if ((protocol == __constant_htons(ETH_P_PPP_DISC)) ||

View File

@@ -0,0 +1,41 @@
diff -Naur xradio-354e8c32e7948d46a63796d0ca266b1f702999b0.org/main.c xradio-354e8c32e7948d46a63796d0ca266b1f702999b0/main.c
--- xradio-354e8c32e7948d46a63796d0ca266b1f702999b0.org/main.c 2020-05-02 17:17:06.000000000 +0000
+++ xradio-354e8c32e7948d46a63796d0ca266b1f702999b0/main.c 2021-11-07 10:30:26.153851399 +0000
@@ -12,7 +12,7 @@
#include <linux/firmware.h>
#include <net/cfg80211.h>
-#include <linux/of_net.h>
+#include <linux/etherdevice.h>
#include <linux/mmc/sdio_func.h>
#include "xradio.h"
@@ -501,9 +501,8 @@
u8 b; /* MRK 5.5a */
struct ieee80211_hw *dev;
struct xradio_common *hw_priv;
- unsigned char randomaddr[ETH_ALEN];
- const unsigned char *addr = NULL;
-
+ unsigned char addr[ETH_ALEN];
+ int ret;
//init xradio_common
dev = xradio_init_common(sizeof(struct xradio_common));
if (!dev) {
@@ -517,12 +516,12 @@
// fill in mac addresses
if (hw_priv->pdev->of_node) {
- addr = of_get_mac_address(hw_priv->pdev->of_node);
+ ret = eth_platform_get_mac_address(hw_priv->pdev, addr);
}
- if (!addr) {
+
+ if (ret<0) {
dev_warn(hw_priv->pdev, "no mac address provided, using random\n");
- eth_random_addr(randomaddr);
- addr = randomaddr;
+ eth_random_addr(addr);
}
for (b = 0; b < XRWL_MAX_VIFS; b++) { /* MRK 5.5a */
memcpy(hw_priv->addresses[b].addr, addr, ETH_ALEN);