diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-08-08 06:38:25 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-08-08 06:38:25 +0000 |
| commit | c585dc5d73e4e2b18278f07482d6a24c29291bfa (patch) | |
| tree | 919f4a5cc7543bb0670c5e01980f60a40134442a /drivers/dahdi/wctc4xxp | |
| parent | c1dcadaf6dc2160dee569b638d949e7c91e1abc7 (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>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10096 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctc4xxp')
| -rw-r--r-- | drivers/dahdi/wctc4xxp/base.c | 15 |
1 files changed, 0 insertions, 15 deletions
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 |