Hello community, here is the log from the commit of package adm8211 checked in at Tue Jun 5 21:54:27 CEST 2007. -------- --- arch/i386/adm8211/adm8211.changes 2007-04-19 23:55:16.000000000 +0200 +++ /mounts/work_users/ro/STABLE/adm8211/adm8211.changes 2007-06-05 21:53:57.664994000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 5 21:53:53 CEST 2007 - ro@suse.de + +- fix build with current kernel + +------------------------------------------------------------------- New: ---- adm8211-skb_change.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ adm8211.spec ++++++ --- /var/tmp/diff_new_pack.S17846/_old 2007-06-05 21:54:08.000000000 +0200 +++ /var/tmp/diff_new_pack.S17846/_new 2007-06-05 21:54:08.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: kernel-source kernel-syms module-init-tools Summary: Kernel Module for ADM8211 Cards Version: 20060111 -Release: 3 +Release: 4 Group: System/Kernel License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -24,6 +24,7 @@ Source: adm8211-%{version}.tar.bz2 Patch1: adm8211.config_h.patch Patch2: adm8211.INIT_WORK.patch +Patch3: adm8211-skb_change.patch Source100: preamble ExclusiveArch: %ix86 x86_64 ppc ppc64 %suse_kernel_module_package -n adm8211 -p %_sourcedir/preamble kdump um @@ -57,6 +58,7 @@ %setup -n adm8211 %patch1 -p1 %patch2 -p1 +%patch3 %build cd .. @@ -90,6 +92,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 05 2007 - ro@suse.de +- fix build with current kernel * Thu Apr 19 2007 - ro@suse.de - no debuginfo (no main package) * Wed Apr 04 2007 - lrupp@suse.de ++++++ adm8211-skb_change.patch ++++++ --- adm8211_hw.c +++ adm8211_hw.c @@ -516,7 +516,7 @@ ieee->stats.rx_packets++; skb->pkt_type = PACKET_OTHERHOST; - skb->mac.raw = skb->data; + skb_reset_mac_header(skb); netif_rx(skb); dev->last_rx = jiffies; @@ -681,7 +681,7 @@ priv->rx_buffers[entry].mapping, pktlen, PCI_DMA_FROMDEVICE); memcpy(skb_put(skb, pktlen), - priv->rx_buffers[entry].skb->tail, + skb_tail_pointer(priv->rx_buffers[entry].skb), pktlen); pci_dma_sync_single_for_device( priv->pdev, @@ -701,7 +701,7 @@ priv->rx_buffers[entry].skb = newskb; priv->rx_buffers[entry].mapping = pci_map_single(priv->pdev, - newskb->tail, + skb_tail_pointer(newskb), RX_PKT_SIZE, PCI_DMA_FROMDEVICE); } else { @@ -734,7 +734,7 @@ #endif stat->rssi = rssi; stat->rate = rate; - skb->mac.raw = skb->data; + skb_reset_mac_header(skb); skb->protocol = __constant_htons(ETH_P_802_2); skb_queue_tail(&priv->rx_queue, skb); tasklet_schedule(&priv->rx_tasklet); @@ -1967,7 +1967,7 @@ info->skb = dev_alloc_skb(RX_PKT_SIZE); if (info->skb == NULL) break; - info->mapping = pci_map_single(priv->pdev, info->skb->tail, + info->mapping = pci_map_single(priv->pdev, skb_tail_pointer(info->skb), RX_PKT_SIZE, PCI_DMA_FROMDEVICE); info->skb->dev = dev; @@ -2392,7 +2392,7 @@ int adm8211_80211_header_parse(struct sk_buff *skb, unsigned char *haddr) { - memcpy(haddr, skb->mac.raw + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */ + memcpy(haddr, skb_mac_header(skb) + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */ return ETH_ALEN; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org