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,10 @@
+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
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Wed, 06 Jun 2007 22:21:53 +0000
+
 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/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
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  <debian.tormod@gmail.com>
+##
+## 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);