Commit 8fb75b79 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

wan: cosa: remove dead cosa_net_ioctl() function 



The ndo_do_ioctl callback is never called with the COSAIO* commands,
so this is never used. Call the hdlc_ioctl function directly instead.

Any user space code that relied on this function working as intended
has never worked in a mainline kernel since before linux-1.0.

Cc: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 73d74f61

drivers/net/wan/cosa.c

+1 −14
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static netdev_tx_t cosa_net_tx(struct sk_buff *skb, struct net_device *d); 
static char *cosa_net_setup_rx(struct channel_data *channel, int size);

static int cosa_net_rx_done(struct channel_data *channel);

static int cosa_net_tx_done(struct channel_data *channel, int size);

static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);



/* Character device */

static char *chrdev_setup_rx(struct channel_data *channel, int size);
@@ -415,7 +414,7 @@ static const struct net_device_ops cosa_ops = { 
	.ndo_open       = cosa_net_open,

	.ndo_stop       = cosa_net_close,

	.ndo_start_xmit = hdlc_start_xmit,

	.ndo_do_ioctl   = cosa_net_ioctl,

	.ndo_do_ioctl   = hdlc_ioctl,

	.ndo_tx_timeout = cosa_net_timeout,

};
@@ -1169,18 +1168,6 @@ static int cosa_ioctl_common(struct cosa_data *cosa, 
	return -ENOIOCTLCMD;

}



static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	int rv;

	struct channel_data *chan = dev_to_chan(dev);



	rv = cosa_ioctl_common(chan->cosa, chan, cmd,

			       (unsigned long)ifr->ifr_data);

	if (rv != -ENOIOCTLCMD)

		return rv;

	return hdlc_ioctl(dev, ifr, cmd);

}



static long cosa_chardev_ioctl(struct file *file, unsigned int cmd,

			       unsigned long arg)

{