diff -u linux-wlan-ng-0.2.8+dfsg/debian/linux-wlan-ng.install linux-wlan-ng-0.2.8+dfsg/debian/linux-wlan-ng.install --- linux-wlan-ng-0.2.8+dfsg/debian/linux-wlan-ng.install +++ linux-wlan-ng-0.2.8+dfsg/debian/linux-wlan-ng.install @@ -7 +7,2 @@ -src/prism2/shared.prism2 /etc/wlan +src/prism2/shared.prism2 etc/wlan +debian/linux-wlan-ng.modprobe etc/modprobe.d diff -u linux-wlan-ng-0.2.8+dfsg/debian/changelog linux-wlan-ng-0.2.8+dfsg/debian/changelog --- linux-wlan-ng-0.2.8+dfsg/debian/changelog +++ linux-wlan-ng-0.2.8+dfsg/debian/changelog @@ -1,3 +1,15 @@ +linux-wlan-ng (0.2.8+dfsg-1ubuntu3) gutsy; urgency=low + + * ubuntu-sk_buff-mac.dpatch: fix compiling of -source package + on 2.6.22 (LP: #114793) + * debian/control.firmware: drop recommends on -modules package + (LP: #115580) + * debian/linux-wlan-ng.modprobe: enable extensions for + network-manager operation (LP: #115594) + * debian/linux-wlan-ng.install: remove slash before etc/wlan + + -- Tormod Volden Wed, 23 Jun 2007 21:51:53 +0200 + linux-wlan-ng (0.2.8+dfsg-1ubuntu2) gutsy; urgency=low * Set maintainer fields in in debian/control.firmware and diff -u linux-wlan-ng-0.2.8+dfsg/debian/patches/ubuntu-wlan-udev-sh.dpatch linux-wlan-ng-0.2.8+dfsg/debian/patches/ubuntu-wlan-udev-sh.dpatch --- linux-wlan-ng-0.2.8+dfsg/debian/patches/ubuntu-wlan-udev-sh.dpatch +++ linux-wlan-ng-0.2.8+dfsg/debian/patches/ubuntu-wlan-udev-sh.dpatch @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad linux-wlan-ng-0.2.8+dfsg~/etc/wlan/wlan-udev.sh linux-wlan-ng-0.2.8+dfsg/etc/wlan/wlan-udev.sh ---- linux-wlan-ng-0.2.8+dfsg~/etc/wlan/wlan-udev.sh 2007-02-27 17:43:02.000000000 +0100 -+++ linux-wlan-ng-0.2.8+dfsg/etc/wlan/wlan-udev.sh 2007-05-14 23:42:17.000000000 +0200 +--- linux-wlan-ng-0.2.8+dfsg~/etc/wlan/wlan-udev.sh 2007-06-23 22:19:42.000000000 +0200 ++++ linux-wlan-ng-0.2.8+dfsg/etc/wlan/wlan-udev.sh 2007-06-23 22:20:57.000000000 +0200 @@ -8,6 +8,9 @@ # 01-01-2007 (rsk) add check for wlan_wext_write # 31-01-2007 (rsk) get the check right this time :) @@ -18,8 +18,12 @@ WEXT_PARAM=/sys/module/p80211/parameters/wlan_wext_write DEVICE=$1 -@@ -19,27 +22,17 @@ +@@ -17,29 +20,21 @@ + + if [ -f $WEXT_PARAM ]; then WLAN_WEXT=`cat $WEXT_PARAM` ++else ++ WLAN_WEXT=0 fi +wlan_enable $DEVICE diff -u linux-wlan-ng-0.2.8+dfsg/debian/patches/00list linux-wlan-ng-0.2.8+dfsg/debian/patches/00list --- linux-wlan-ng-0.2.8+dfsg/debian/patches/00list +++ linux-wlan-ng-0.2.8+dfsg/debian/patches/00list @@ -21,0 +22 @@ +ubuntu-sk_buff-mac.dpatch diff -u linux-wlan-ng-0.2.8+dfsg/debian/control.firmware linux-wlan-ng-0.2.8+dfsg/debian/control.firmware --- linux-wlan-ng-0.2.8+dfsg/debian/control.firmware +++ linux-wlan-ng-0.2.8+dfsg/debian/control.firmware @@ -10,7 +10,7 @@ Package: linux-wlan-ng-firmware-files Architecture: any Depends: linux-wlan-ng (>= ${Source-Version}) -Recommends: linux-wlan-ng-doc, linux-wlan-ng-${Source-Version}-modules +Recommends: linux-wlan-ng-doc Description: firmware files used by the linux-wlan-ng driver linux-wlan-ng is a set of drivers and utilities that is intended to provide the full range of IEEE 802.11 MAC management capabilities for use in only in patch2: unchanged: --- linux-wlan-ng-0.2.8+dfsg.orig/debian/linux-wlan-ng.modprobe +++ linux-wlan-ng-0.2.8+dfsg/debian/linux-wlan-ng.modprobe @@ -0,0 +1,2 @@ +# enable wireless extensions on prism2 for network-manager operation +options p80211 wlan_wext_write=1 only in patch2: unchanged: --- linux-wlan-ng-0.2.8+dfsg.orig/debian/patches/ubuntu-sk_buff-mac.dpatch +++ linux-wlan-ng-0.2.8+dfsg/debian/patches/ubuntu-sk_buff-mac.dpatch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu-sk_buff-mac.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad linux-wlan-ng-0.2.8+dfsg~/src/p80211/p80211conv.c linux-wlan-ng-0.2.8+dfsg/src/p80211/p80211conv.c +--- linux-wlan-ng-0.2.8+dfsg~/src/p80211/p80211conv.c 2007-03-19 15:37:00.000000000 +0000 ++++ linux-wlan-ng-0.2.8+dfsg/src/p80211/p80211conv.c 2007-06-06 22:20:07.000000000 +0000 +@@ -498,7 +498,7 @@ + } + + skb->protocol = eth_type_trans(skb, netdev); +- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ ++ skb->mac_header = (unsigned char *) e_hdr; /* new MAC header */ + + /* jkriegl: process signal and noise as set in hfa384x_int_rx() */ + /* jkriegl: only process signal/noise if requested by iwspy */ +diff -urNad linux-wlan-ng-0.2.8+dfsg~/src/p80211/p80211netdev.c linux-wlan-ng-0.2.8+dfsg/src/p80211/p80211netdev.c +--- linux-wlan-ng-0.2.8+dfsg~/src/p80211/p80211netdev.c 2007-03-19 15:37:00.000000000 +0000 ++++ linux-wlan-ng-0.2.8+dfsg/src/p80211/p80211netdev.c 2007-06-06 22:20:07.000000000 +0000 +@@ -389,7 +389,7 @@ + + /* set up various data fields */ + skb->dev = dev; +- skb->mac.raw = skb->data ; ++ skb_reset_mac_header(skb); + skb->ip_summed = CHECKSUM_NONE; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_80211_RAW); +diff -urNad linux-wlan-ng-0.2.8+dfsg~/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.8+dfsg/src/prism2/driver/hfa384x.c +--- linux-wlan-ng-0.2.8+dfsg~/src/prism2/driver/hfa384x.c 2007-03-19 15:37:00.000000000 +0000 ++++ linux-wlan-ng-0.2.8+dfsg/src/prism2/driver/hfa384x.c 2007-06-06 22:20:07.000000000 +0000 +@@ -3645,7 +3645,7 @@ + /* the prism2 cards don't return the FCS */ + datap = skb_put(skb, WLAN_CRC_LEN); + memset (datap, 0xff, WLAN_CRC_LEN); +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb); +diff -urNad linux-wlan-ng-0.2.8+dfsg~/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.8+dfsg/src/prism2/driver/hfa384x_usb.c +--- linux-wlan-ng-0.2.8+dfsg~/src/prism2/driver/hfa384x_usb.c 2007-03-19 15:37:00.000000000 +0000 ++++ linux-wlan-ng-0.2.8+dfsg/src/prism2/driver/hfa384x_usb.c 2007-06-06 22:20:07.000000000 +0000 +@@ -4255,7 +4255,7 @@ + /* The prism2 series does not return the CRC */ + memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); + +- skb->mac.raw = skb->data; ++ skb_reset_mac_header(skb); + + /* Attach the rxmeta, set some stuff */ + p80211skb_rxmeta_attach(wlandev, skb);