Hello community, here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2012-10-23 19:37:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdjmod (Old) and /work/SRC/openSUSE:Factory/.hdjmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdjmod", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes 2012-04-12 09:26:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2012-10-23 19:37:24.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 16 19:57:00 UTC 2012 - [email protected] + +- Fixed build on kernel 3.6 + +------------------------------------------------------------------- New: ---- hdjmod_kernel_3.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdjmod.spec ++++++ --- /var/tmp/diff_new_pack.b9OUdZ/_old 2012-10-23 19:37:28.000000000 +0200 +++ /var/tmp/diff_new_pack.b9OUdZ/_new 2012-10-23 19:37:28.000000000 +0200 @@ -45,6 +45,8 @@ Patch4: hdjmod_kernel_2.6.39.patch # PATCH-FIX-UPSTREAM hdjmod_fix_hotplug.patch [bnc#746358] [email protected] -- Don't load on hotplug of devices from other vendors Patch5: hdjmod_fix_hotplug.patch +# PATCH-FIX-UPSTREAM hdjmod_kernel_3.6.patch [bnc#783848] [email protected] -- Fix build on kernel 3.6 and newer +Patch6: hdjmod_kernel_3.6.patch # The package triggers RPM-Lint warning because it misses requires to the proper kernel packages # These requires should be added by the kernel_module_package macro, so, therefore the are not @@ -68,6 +70,7 @@ %endif %patch1 -p1 %patch5 -p1 +%patch6 -p1 set -- * mkdir source mv "$@" source/ ++++++ hdjmod_kernel_3.6.patch ++++++ diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c --- hdjmod-1.28o/device.c 2009-01-27 15:25:50.000000000 +0100 +++ hdjmod-1.28/device.c 2012-10-16 21:52:40.000000000 +0200 @@ -2393,6 +2393,13 @@ /* Try to allocate a netlink socket minimizing the risk of collision, * by starting at the max unit number and counting down */ for (unit=MAX_LINKS-1;unit>MIN_NETLINK_UNIT;unit--) { +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ) + nl_sk = netlink_kernel_create( + &init_net, + unit, + THIS_MODULE, + NULL); +#else nl_sk = netlink_kernel_create( #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) &init_net, @@ -2404,6 +2411,7 @@ NULL, #endif THIS_MODULE); +#endif if (nl_sk!=NULL) { netlink_unit = unit; return 0; @@ -2469,6 +2477,20 @@ return NULL; } +#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ) + nlh = nlmsg_put(skb, target_pid, seq, t, size, flags); + if(!nlh) { + if (skb) { + kfree_skb(skb); + } + return NULL; + } + data = nlmsg_data(nlh); + if (size > 0) { + memcpy(data, payload, size); + } + return skb; +#else nlh = NLMSG_PUT(skb, target_pid, seq, t, size); nlh->nlmsg_flags = flags; data = NLMSG_DATA(nlh); @@ -2482,6 +2504,7 @@ kfree_skb(skb); } return NULL; +#endif } int register_for_netlink(struct snd_hdj_chip* chip, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
