Revert "Move xen patchset to new version's subdir."

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / netfilter-ipt_LOG-mac

diff --git a/src/patches/suse-2.6.27.31/patches.suse/netfilter-ipt_LOG-mac b/src/patches/suse-2.6.27.31/patches.suse/netfilter-ipt_LOG-mac
deleted file mode 100644 (file)
index dfc104a..0000000
--- a/src/patches/suse-2.6.27.31/patches.suse/netfilter-ipt_LOG-mac
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jaroslav Kysela <perex@suse.cz>
-Subject: LTC23987-iptables LOG output shows too long MAC info
-References: 176921
-
-LTC23987-iptables LOG output shows too long MAC info for qeth VLAN interface
-
-Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-
----
- net/ipv4/netfilter/ipt_LOG.c |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/net/ipv4/netfilter/ipt_LOG.c
-+++ b/net/ipv4/netfilter/ipt_LOG.c
-@@ -410,12 +410,12 @@ ipt_log_packet(unsigned int pf,
-               printk("MAC=");
-               if (skb->dev && skb->dev->hard_header_len
-                   && skb->mac_header != skb->network_header) {
--                      int i;
-+                      int i, len;
-                       const unsigned char *p = skb_mac_header(skb);
--                      for (i = 0; i < skb->dev->hard_header_len; i++,p++)
--                              printk("%02x%c", *p,
--                                     i==skb->dev->hard_header_len - 1
--                                     ? ' ':':');
-+                      len = (int)(skb_network_header(skb) - p);
-+                      len = min((int)skb->dev->hard_header_len, len);
-+                      for (i = 0; i < len; i++,p++)
-+                              printk("%02x%c", *p, i==len - 1 ? ' ':':');
-               } else
-                       printk(" ");
-       }