Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56fc7e71 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

ax25/kiss: Replace ax_header_ops with ax25_header_ops 



The two sets of header operations are functionally identical remove the
duplicate definition.

Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-hams@vger.kernel.org
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03ec2ac0

drivers/net/hamradio/mkiss.c

+1 −32
Original line number Diff line number Diff line
@@ -573,32 +573,6 @@ static int ax_open_dev(struct net_device *dev) 
	return 0;

}



#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)



/* Return the frame type ID */

static int ax_header(struct sk_buff *skb, struct net_device *dev,

		     unsigned short type, const void *daddr,

		     const void *saddr, unsigned len)

{

#ifdef CONFIG_INET

	if (type != ETH_P_AX25)

		return ax25_hard_header(skb, dev, type, daddr, saddr, len);

#endif

	return 0;

}





static int ax_rebuild_header(struct sk_buff *skb)

{

#ifdef CONFIG_INET

	return ax25_rebuild_header(skb);

#else

	return 0;

#endif

}



#endif	/* CONFIG_{AX25,AX25_MODULE} */



/* Open the low-level part of the AX25 channel. Easy! */

static int ax_open(struct net_device *dev)

{
@@ -662,11 +636,6 @@ static int ax_close(struct net_device *dev) 
	return 0;

}



static const struct header_ops ax_header_ops = {

	.create    = ax_header,

	.rebuild   = ax_rebuild_header,

};



static const struct net_device_ops ax_netdev_ops = {

	.ndo_open            = ax_open_dev,

	.ndo_stop            = ax_close,
@@ -682,7 +651,7 @@ static void ax_setup(struct net_device *dev) 
	dev->addr_len        = 0;

	dev->type            = ARPHRD_AX25;

	dev->tx_queue_len    = 10;

	dev->header_ops      = &ax_header_ops;

	dev->header_ops      = &ax25_header_ops;

	dev->netdev_ops	     = &ax_netdev_ops;