mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	can: remove obsolete empty ioctl() handler
With commit c7cbdbf29f ("net: rework SIOCGSTAMP ioctl handling") the only
ioctl function in can_ioctl() has been removed.
As this SIOCGSTAMP ioctl command is now handled in net/socket.c we can entirely
remove the CAN specific ioctl functions.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
			
			
This commit is contained in:
		
							parent
							
								
									4c7f715485
								
							
						
					
					
						commit
						60649d4e0a
					
				
					 4 changed files with 2 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -57,6 +57,5 @@ extern void can_rx_unregister(struct net *net, struct net_device *dev,
 | 
			
		|||
			      void *data);
 | 
			
		||||
 | 
			
		||||
extern int can_send(struct sk_buff *skb, int loop);
 | 
			
		||||
extern int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 | 
			
		||||
 | 
			
		||||
#endif /* !_CAN_CORE_H */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -87,15 +87,6 @@ static atomic_t skbcounter = ATOMIC_INIT(0);
 | 
			
		|||
 * af_can socket functions
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
int can_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 | 
			
		||||
{
 | 
			
		||||
	switch (cmd) {
 | 
			
		||||
	default:
 | 
			
		||||
		return -ENOIOCTLCMD;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
EXPORT_SYMBOL(can_ioctl);
 | 
			
		||||
 | 
			
		||||
static void can_sock_destruct(struct sock *sk)
 | 
			
		||||
{
 | 
			
		||||
	skb_queue_purge(&sk->sk_receive_queue);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1688,7 +1688,7 @@ static const struct proto_ops bcm_ops = {
 | 
			
		|||
	.accept        = sock_no_accept,
 | 
			
		||||
	.getname       = sock_no_getname,
 | 
			
		||||
	.poll          = datagram_poll,
 | 
			
		||||
	.ioctl         = can_ioctl,	/* use can_ioctl() from af_can.c */
 | 
			
		||||
	.ioctl         = sock_no_ioctl,
 | 
			
		||||
	.gettstamp     = sock_gettstamp,
 | 
			
		||||
	.listen        = sock_no_listen,
 | 
			
		||||
	.shutdown      = sock_no_shutdown,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -845,7 +845,7 @@ static const struct proto_ops raw_ops = {
 | 
			
		|||
	.accept        = sock_no_accept,
 | 
			
		||||
	.getname       = raw_getname,
 | 
			
		||||
	.poll          = datagram_poll,
 | 
			
		||||
	.ioctl         = can_ioctl,	/* use can_ioctl() from af_can.c */
 | 
			
		||||
	.ioctl         = sock_no_ioctl,
 | 
			
		||||
	.gettstamp     = sock_gettstamp,
 | 
			
		||||
	.listen        = sock_no_listen,
 | 
			
		||||
	.shutdown      = sock_no_shutdown,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue