diff options
author | Shaun Ruffell <sruffell@digium.com> | 2011-08-11 19:56:14 +0000 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2011-08-11 19:56:14 +0000 |
commit | 2e8172d17fb8cae37b9ee4a6633a7bac70b35606 (patch) | |
tree | b2cb5df0a5b52af9a26d56af66242b13035a5a4f | |
parent | a113d1106ffa2a74452c330cf40b6ad23dd775e6 (diff) |
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@digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10096
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10115 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/voicebus/voicebus_net.c | 15 | ||||
-rw-r--r-- | drivers/dahdi/wctc4xxp/base.c | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/drivers/dahdi/voicebus/voicebus_net.c b/drivers/dahdi/voicebus/voicebus_net.c index 7d4af7f..41fca2f 100644 --- a/drivers/dahdi/voicebus/voicebus_net.c +++ b/drivers/dahdi/voicebus/voicebus_net.c @@ -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 vb_net_register(struct voicebus *vb, const char *board_name) { 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; diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 2ed2147..d1e3db9 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -394,22 +394,16 @@ struct wcdte { #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 @@ wctc4xxp_net_register(struct wcdte *wc) { 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 |