[PATCH] ip_queue restore MAC copying

[James Morris <jmorris@xxxxxxxxxxxxxxxx>]

Description:
Restores ability for ip_queue to copy MAC data to userspace following
changes made to skbuf structure.


- James
-- 
James Morris
<jmorris@xxxxxxxxxxxxxxxx>

diff -ur linux-2.4.4/net/ipv4/netfilter/ip_queue.c 
linux-2.4.4-nf1/net/ipv4/netfilter/ip_queue.c
--- linux-2.4.4/net/ipv4/netfilter/ip_queue.c   Tue Dec 12 07:37:04 2000
+++ linux-2.4.4-nf1/net/ipv4/netfilter/ip_queue.c       Fri May  4 20:47:45 2001
@@ -400,6 +400,13 @@
        if (e->info->outdev) strcpy(pm->outdev_name, e->info->outdev->name);
        else pm->outdev_name[0] = '\0';
        pm->hw_protocol = e->skb->protocol;
+       if (e->info->indev && e->skb->dev) {
+               pm->hw_type = e->skb->dev->type;
+               if (e->skb->dev->hard_header_parse)
+                       pm->hw_addrlen =
+                               e->skb->dev->hard_header_parse(e->skb,
+                                                              pm->hw_addr);
+       }
        if (data_len)
                memcpy(pm->payload, e->skb->data, data_len);
        nlh->nlmsg_len = skb->tail - old_tail;