From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Fri, 3 Feb 2012 18:25:35 +0000 (-0800)
Subject: Revert "compat: backport __netdev_printk()"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=61edfc0cb7f9bd5624d77d6755ec5ad8724a2da4;p=openwrt%2Fstaging%2Fblogic.git

Revert "compat: backport __netdev_printk()"

Reverting for now until this is fixed for all kernels
that we support.

This reverts commit fd3a74e12f687509da0a996b4e01c4fa6ca32ff8.
---

diff --git a/compat/Makefile b/compat/Makefile
index 3c72ef9bf1e7..fa9c6cb9479e 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -34,7 +34,6 @@ compat-$(CONFIG_COMPAT_KERNEL_2_6_39) += \
 	compat-2.6.39.o \
 	kstrtox.o
 compat-$(CONFIG_COMPAT_KERNEL_3_0) += compat-3.0.o
-compat-$(CONFIG_COMPAT_KERNEL_3_2) += compat-3.2.o
 
 compat-$(CONFIG_COMPAT_CORDIC) += cordic.o
 compat-$(CONFIG_COMPAT_CRC8) += crc8.o
diff --git a/compat/compat-3.2.c b/compat/compat-3.2.c
deleted file mode 100644
index 2e4902fed0f0..000000000000
--- a/compat/compat-3.2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2012  Luis R. Rodriguez <mcgrof@frijolero.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Compatibility file for Linux wireless for kernels 3.2.
- */
-
-int __netdev_printk(const char *level, const struct net_device *dev,
-			   struct va_format *vaf)
-{
-	int r;
-
-	if (dev && dev->dev.parent)
-		r = dev_printk(level, dev->dev.parent, "%s: %pV",
-			       netdev_name(dev), vaf);
-	else if (dev)
-		r = printk("%s%s: %pV", level, netdev_name(dev), vaf);
-	else
-		r = printk("%s(NULL net_device): %pV", level, vaf);
-
-	return r;
-}
-EXPORT_SYMBOL(__netdev_printk);
diff --git a/include/linux/compat-3.2.h b/include/linux/compat-3.2.h
index cb14f0b12042..a17c4adf2158 100644
--- a/include/linux/compat-3.2.h
+++ b/include/linux/compat-3.2.h
@@ -73,9 +73,6 @@ static inline void *dma_zalloc_coherent(struct device *dev, size_t size,
 	return ret;
 }
 
-extern int __netdev_printk(const char *level, const struct net_device *dev,
-			   struct va_format *vaf);
-
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)) */
 
 #endif /* LINUX_3_2_COMPAT_H */