diff options
| -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 4a82333..f0eabea 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 * @@ -206,23 +200,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 3ab4ca6..1a39a49 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -399,22 +399,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 } @@ -691,23 +685,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 |