Commit 9c770f3b authored by Jiri Kosina's avatar Jiri Kosina Committed by Greg Kroah-Hartman

Staging: cxt1e1: remove code guarded by GENERIC_HDLC_VERSION

Current linux kernel has GENERIC_HDLC_VERSION equal to 4, no need to
have dead code in-kernel which was there for ancient kernel versions.
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bb71770c
...@@ -318,34 +318,6 @@ chan_close (struct net_device * ndev) ...@@ -318,34 +318,6 @@ chan_close (struct net_device * ndev)
} }
#if !defined(GENERIC_HDLC_VERSION) || (GENERIC_HDLC_VERSION < 4)
/** Linux 2.4.18-19 **/
STATIC int
chan_ioctl (hdlc_device * hdlc, struct ifreq * ifr, int cmd)
{
if (cmd == HDLCSCLOCK)
{
ifr->ifr_ifru.ifru_ivalue = LINE_DEFAULT;
return 0;
}
return -EINVAL;
}
#endif
#if !defined(GENERIC_HDLC_VERSION) || (GENERIC_HDLC_VERSION < 4)
STATIC int
chan_dev_ioctl (struct net_device * hdlc, struct ifreq * ifr, int cmd)
{
if (cmd == HDLCSCLOCK)
{
ifr->ifr_ifru.ifru_ivalue = LINE_DEFAULT;
return 0;
}
return -EINVAL;
}
#else
STATIC int STATIC int
chan_dev_ioctl (struct net_device * dev, struct ifreq * ifr, int cmd) chan_dev_ioctl (struct net_device * dev, struct ifreq * ifr, int cmd)
{ {
...@@ -359,7 +331,6 @@ chan_attach_noop (struct net_device * ndev, unsigned short foo_1, unsigned short ...@@ -359,7 +331,6 @@ chan_attach_noop (struct net_device * ndev, unsigned short foo_1, unsigned short
return 0; /* our driver has nothing to do here, show's return 0; /* our driver has nothing to do here, show's
* over, go home */ * over, go home */
} }
#endif
STATIC struct net_device_stats * STATIC struct net_device_stats *
...@@ -422,16 +393,6 @@ get_ci_by_dev (struct net_device * ndev) ...@@ -422,16 +393,6 @@ get_ci_by_dev (struct net_device * ndev)
} }
#if !defined(GENERIC_HDLC_VERSION) || (GENERIC_HDLC_VERSION < 4)
STATIC int
c4_linux_xmit (hdlc_device * hdlc, struct sk_buff * skb)
{
int rval;
rval = musycc_start_xmit (DEV_TO_PRIV (hdlc)->ci, DEV_TO_PRIV (hdlc)->channum, skb);
return -rval;
}
#else /* new */
STATIC int STATIC int
c4_linux_xmit (struct sk_buff * skb, struct net_device * ndev) c4_linux_xmit (struct sk_buff * skb, struct net_device * ndev)
{ {
...@@ -445,7 +406,6 @@ c4_linux_xmit (struct sk_buff * skb, struct net_device * ndev) ...@@ -445,7 +406,6 @@ c4_linux_xmit (struct sk_buff * skb, struct net_device * ndev)
rval = musycc_start_xmit (priv->ci, priv->channum, skb); rval = musycc_start_xmit (priv->ci, priv->channum, skb);
return -rval; return -rval;
} }
#endif /* GENERIC_HDLC_VERSION */
static const struct net_device_ops chan_ops = { static const struct net_device_ops chan_ops = {
.ndo_open = chan_open, .ndo_open = chan_open,
......
...@@ -117,6 +117,8 @@ extern "C" ...@@ -117,6 +117,8 @@ extern "C"
#include "pmcc4_private.h" #include "pmcc4_private.h"
char *get_hdlc_name (hdlc_device *);
/* /*
* external interface * external interface
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment