diff --git a/SOURCES/bz1506230.patch b/SOURCES/bz1506230.patch new file mode 100644 index 0000000..824242a --- /dev/null +++ b/SOURCES/bz1506230.patch @@ -0,0 +1,20 @@ +commit 94b3978aa1d01f09b29dbc2d61e1a2bddec313df +Author: Lukas Herbolt +Date: Wed Oct 25 15:47:18 2017 -0500 + + Fix BZ1506230 by fixing netdev.receive probe to work on kernels after v3.14. + +diff --git a/tapset/linux/networking.stp b/tapset/linux/networking.stp +index 76174c7..17cba9c 100644 +--- a/tapset/linux/networking.stp ++++ b/tapset/linux/networking.stp +@@ -59,7 +59,8 @@ function get_netdev_name:string (addr:long) { + /// + // Main device receive routine, be called when packet arrives on network device + probe netdev.receive +- = kernel.function("netif_receive_skb") ++ = kernel.function("netif_receive_skb_internal") !, ++ kernel.function("netif_receive_skb") + { + dev_name = kernel_string($skb->dev->name) + length = $skb->len diff --git a/SPECS/systemtap.spec b/SPECS/systemtap.spec index 065c0fa..0890356 100644 --- a/SPECS/systemtap.spec +++ b/SPECS/systemtap.spec @@ -72,7 +72,7 @@ Name: systemtap Version: 3.1 -Release: 4%{?dist} +Release: 5%{?dist} # for version, see also configure.ac @@ -198,6 +198,7 @@ Patch18: bz1430828.patch Patch19: bz1433391.patch Patch20: bz1436845.patch Patch21: bz1503979.patch +Patch22: bz1506230.patch # Install requirements Requires: systemtap-client = %{version}-%{release} @@ -497,6 +498,7 @@ cd .. %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %build @@ -1165,6 +1167,9 @@ done # PRERELEASE %changelog +* Sun Dec 03 2017 Frank Ch. Eigler - 3.1-5 +- rhbz1519860 netdev probe + * Thu Oct 19 2017 Frank Ch. Eigler - 3.1-4 - rhbz1503979 @min/@max miscalculation