[svn-commits] sruffell: linux/trunk r10096 - in /linux/trunk/drivers/dahdi: voicebus/ wctc4...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Aug  8 01:38:25 2011
New Revision: 10096

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10096
Log:
wctc4xxp, wcte12xp, wctdm24xxp: Remove check for HAVE_NETDEV_PRIV

DAHDI currently supports kernels >= 2.6.9. netdev_priv() has been in the
mainline kernel since versions 2.6.6 so it's available in all the
supported kernels. This change is needed to compile against the 3.1 kernel.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/voicebus/voicebus_net.c
    linux/trunk/drivers/dahdi/wctc4xxp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/voicebus_net.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/voicebus_net.c?view=diff&rev=10096&r1=10095&r2=10096
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/voicebus_net.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/voicebus_net.c Mon Aug  8 01:38:25 2011
@@ -35,22 +35,16 @@
 
 #ifdef VOICEBUS_NET_DEBUG
 
-#ifdef HAVE_NETDEV_PRIV
 struct voicebus_netdev_priv {
 	struct voicebus *vb;
 };
-#endif
 
 static inline struct voicebus *
 voicebus_from_netdev(struct net_device *netdev)
 {
-#ifdef HAVE_NETDEV_PRIV
 	struct voicebus_netdev_priv *priv;
 	priv = netdev_priv(netdev);
 	return priv->vb;
-#else
-	return netdev->priv;
-#endif
 }
 
 static void *
@@ -209,23 +203,14 @@
 {
 	int res;
 	struct net_device *netdev;
-#	ifdef HAVE_NETDEV_PRIV
 	struct voicebus_netdev_priv *priv;
-#	endif
 	const char our_mac[] = { 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
 
-#	ifdef HAVE_NETDEV_PRIV
 	netdev = alloc_netdev(sizeof(*priv), board_name, ether_setup);
 	if (!netdev)
 		return -ENOMEM;
 	priv = netdev_priv(netdev);
 	priv->vb = vb;
-#	else
-	netdev = alloc_netdev(0, vb->board_name, ether_setup);
-	if (!netdev)
-		return -ENOMEM;
-	netdev->priv = vb;
-#	endif
 	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
 #	ifdef HAVE_NET_DEVICE_OPS
 	netdev->netdev_ops = &vb_netdev_ops;

Modified: linux/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=10096&r1=10095&r2=10096
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/base.c Mon Aug  8 01:38:25 2011
@@ -394,22 +394,16 @@
 #endif
 };
 
-#ifdef HAVE_NETDEV_PRIV
 struct wcdte_netdev_priv {
 	struct wcdte *wc;
 };
-#endif
 
 static inline struct wcdte *
 wcdte_from_netdev(struct net_device *netdev)
 {
-#ifdef HAVE_NETDEV_PRIV
 	struct wcdte_netdev_priv *priv;
 	priv = netdev_priv(netdev);
 	return priv->wc;
-#else
-	return netdev->priv;
-#endif
 }
 
 
@@ -686,23 +680,14 @@
 {
 	int res;
 	struct net_device *netdev;
-#	ifdef HAVE_NETDEV_PRIV
 	struct wcdte_netdev_priv *priv;
-#	endif
 	const char our_mac[] = { 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
 
-#	ifdef HAVE_NETDEV_PRIV
 	netdev = alloc_netdev(sizeof(*priv), wc->board_name, ether_setup);
 	if (!netdev)
 		return -ENOMEM;
 	priv = netdev_priv(netdev);
 	priv->wc = wc;
-#	else
-	netdev = alloc_netdev(0, wc->board_name, ether_setup);
-	if (!netdev)
-		return -ENOMEM;
-	netdev->priv = wc;
-#	endif
 	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
 
 #	ifdef HAVE_NET_DEVICE_OPS