diff -ruN ndas-1.1-2-orig/ndas_core_main.c ndas-1.1-2/ndas_core_main.c
--- ndas-1.1-2-orig/ndas_core_main.c	2007-06-08 02:46:44.000000000 +0200
+++ ndas-1.1-2/ndas_core_main.c	2007-06-10 14:47:03.000000000 +0200
@@ -132,7 +132,7 @@
     struct net_device *dev;
     
     read_lock(&dev_base_lock);
-    for (dev=dev_base; dev; dev=dev->next) {
+    for_each_netdev(dev) {
         if ( strcmp(dev->name, "lo") == 0 ) 
             continue;
         ndas_unregister_network_interface(dev->name);
@@ -147,7 +147,7 @@
     struct net_device *dev;
     
     read_lock(&dev_base_lock);
-    for (dev=dev_base; dev; dev=dev->next) {
+    for_each_netdev(dev) {
         if ( strcmp(dev->name, "lo") == 0 ) 
             continue;
 		if ( ndas_dev != NULL && ndas_dev[0]!=0 && strcmp(dev->name, ndas_dev) != 0 )
diff -ruN ndas-1.1-2-orig/sal/net.c ndas-1.1-2/sal/net.c
--- ndas-1.1-2-orig/sal/net.c	2007-06-08 02:46:44.000000000 +0200
+++ ndas-1.1-2/sal/net.c	2007-06-10 14:47:30.000000000 +0200
@@ -119,9 +119,9 @@
             "h(%p),data(%dbytes,%p)=%s,tail=%p,"\
             "sock(%p),data_len=%d,head=%p,end=%p}",\
             skb,\
-            skb->mac.raw,\
-            SAL_DEBUG_HEXDUMP_S(skb->mac.raw, IFHWADDRLEN),\
-            skb->h.raw,\
+            skb->mac_header,\
+            SAL_DEBUG_HEXDUMP_S(skb->mac_header, IFHWADDRLEN),\
+            skb->transport_header,\
             skb->len,\
             skb->data,\
             SAL_DEBUG_HEXDUMP(skb->data,skb->len),\
@@ -145,9 +145,9 @@
             "nh(%p),h(%p),data(%dbytes,%p),tail=%p,"\
             "sock(%p),data_len=%d,head=%p,end=%p}",\
             skb,\
-            skb->mac.raw,\
-            skb->nh.raw, \
-            skb->h.raw,\
+            skb->mac_header,\
+            skb->network_header, \
+            skb->transport_header,\
             skb->len,\
             skb->data,\
             skb->tail,\
@@ -181,7 +181,7 @@
  * So we added ETH_DEST macro
  */
 static inline char* ETH_DEST(struct sk_buff* skb) {
-    return ((struct ethhdr *)skb->mac.raw)->h_dest;
+    return ((struct ethhdr *)skb->mac_header)->h_dest;
 }
 
 #ifdef NDAS_SNAP
@@ -240,7 +240,7 @@
     /* link layer header */
     dbgl_salnet(9,"ing skb=%p",skb);
     dbgl_salnet(8,"skb=%s",DEBUG_SK_BUFF(skb));
-    bufs->mac_header.ptr = skb->mac.raw;
+    bufs->mac_header.ptr = skb->mac_header;
     bufs->mac_header.len = sizeof(struct ethhdr);// skb->len - skb->data_len; 
     /* data */
     bufs->segs[0].ptr = skb->data;
@@ -677,12 +677,12 @@
     printk("Failed to allocate skb len=%d\n", len);
     return NULL;
     }
-    bufs->mac_header.ptr = skb->mac.raw = skb->data;
+    bufs->mac_header.ptr = skb->mac_header = skb->data;
     skb_reserve(skb, SAL_ETHER_HEADER_SIZE);
     // TODO: size should be different for 802.2 snap , and added 2 for alignment
     bufs->segs[0].ptr = 
-    skb->h.raw = 
-    skb->nh.raw = skb_put(skb,len - SAL_ETHER_HEADER_SIZE);
+    skb->transport_header = 
+    skb->network_header = skb_put(skb,len - SAL_ETHER_HEADER_SIZE);
     bufs->segs[0].len = len - SAL_ETHER_HEADER_SIZE;
     bufs->size = 1;
     bufs->total_len = len;
@@ -709,8 +709,8 @@
         printk("Failed to clone skb\n");
     } else {
 /*	printk("skb_clone: skb=%p, mac=%p, data=%p -> skb=%p, mac=%p, data=%p\n",
-		(char*) buf, ((struct sk_buff*)buf)->mac.raw, ((struct sk_buff*)buf)->data, 
-		(char*) skb, skb->mac.raw, skb->data);*/
+		(char*) buf, ((struct sk_buff*)buf)->mac_header, ((struct sk_buff*)buf)->data, 
+		(char*) skb, skb->mac_header, skb->data);*/
     }
     return (sal_net_buff) skb;
 }
@@ -726,7 +726,7 @@
 	return NULL;
     }
 
-    bufs->mac_header.ptr = skb->mac.raw;
+    bufs->mac_header.ptr = skb->mac_header;
     bufs->segs[0].ptr = skb->data;
     bufs->segs[0].len = len - SAL_ETHER_HEADER_SIZE;
     bufs->size = 1;