Hello community, here is the log from the commit of package zaptel checked in at Tue Jun 5 22:08:49 CEST 2007. -------- --- zaptel/zaptel.changes 2007-04-04 22:03:37.000000000 +0200 +++ /mounts/work_users/ro/STABLE/zaptel/zaptel.changes 2007-06-05 22:02:56.412095000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 5 22:02:50 CEST 2007 - ro@suse.de + +- fix build with current kernel + +------------------------------------------------------------------- New: ---- zaptel-skb_change.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zaptel.spec ++++++ --- /var/tmp/diff_new_pack.F14047/_old 2007-06-05 22:08:38.000000000 +0200 +++ /var/tmp/diff_new_pack.F14047/_new 2007-06-05 22:08:38.000000000 +0200 @@ -16,7 +16,7 @@ %define bristuff bristuff-0.3.0-PRE-1s Summary: Tools for the Zapata Telephony Interface Driver Version: 1.2.10 -Release: 44 +Release: 63 License: GNU General Public License (GPL) Group: Productivity/Telephony/Utilities PreReq: %insserv_prereq %fillup_prereq udev @@ -36,6 +36,7 @@ Patch2: %name-km.patch Patch3: %name-modparam.patch Patch4: zaptel.config_h.patch +Patch5: zaptel-skb_change.patch %suse_kernel_module_package -p %_sourcedir/preamble kdump um iseries64 ppc64 %description @@ -83,6 +84,7 @@ %patch2 %patch3 %patch4 -p1 +%patch5 %build make prereq all OPTFLAGS="%optflags" @@ -145,6 +147,8 @@ /usr/include/linux/*.h %changelog +* Tue Jun 05 2007 - ro@suse.de +- fix build with current kernel * Wed Apr 04 2007 - lrupp@suse.de - added module-init-tools to BuildRequires * Tue Jan 23 2007 - olh@suse.de ++++++ zaptel-skb_change.patch ++++++ --- wctdm24xxp.c +++ wctdm24xxp.c @@ -2865,7 +2865,7 @@ return -ENODEV; } - res = pci_module_init(&wctdm_driver); + res = pci_register_driver(&wctdm_driver); if (res) return -ENODEV; return 0; --- zaptel.c +++ zaptel.c @@ -6064,7 +6064,7 @@ if (skb && (ms->flags & ZT_FLAG_NETDEV)) #ifdef NEW_HDLC_INTERFACE { - skb->mac.raw = skb->data; + skb_reset_mac_header(skb); skb->dev = ztchan_to_dev(ms); #ifdef ZAP_HDLC_TYPE_TRANS skb->protocol = hdlc_type_trans(skb, ztchan_to_dev(ms)); --- ztd-eth.c +++ ztd-eth.c @@ -88,7 +88,7 @@ { struct zt_span *span; struct ztdeth_header *zh; - zh = (struct ztdeth_header *)skb->nh.raw; + zh = (struct ztdeth_header *)skb_network_header(skb); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9) span = ztdeth_getspan(eth_hdr(skb)->h_source, zh->subaddr); #else @@ -167,7 +167,7 @@ /* Setup protocol and such */ skb->protocol = __constant_htons(ETH_P_ZTDETH); - skb->nh.raw = skb->data; + skb_reset_network_header(skb); skb->dev = dev; if (dev->hard_header) dev->hard_header(skb, dev, ETH_P_ZTDETH, addr, dev->dev_addr, skb->len); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org