diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-02 01:03:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 16:43:39 -0500 |
commit | 56fc7e7128a1ca9c52d8e2907f0f13871957b1bc (patch) | |
tree | 9a33c8c062fa67a251e7b306fa4ba703e7407303 /drivers/net/hamradio | |
parent | 03ec2ac0977dd1d44f8637f33c63a9a7022cf9af (diff) |
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: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index f990bb1c3e02..e37c8d515ce8 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -573,32 +573,6 @@ static int ax_open_dev(struct net_device *dev) | |||
573 | return 0; | 573 | return 0; |
574 | } | 574 | } |
575 | 575 | ||
576 | #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) | ||
577 | |||
578 | /* Return the frame type ID */ | ||
579 | static int ax_header(struct sk_buff *skb, struct net_device *dev, | ||
580 | unsigned short type, const void *daddr, | ||
581 | const void *saddr, unsigned len) | ||
582 | { | ||
583 | #ifdef CONFIG_INET | ||
584 | if (type != ETH_P_AX25) | ||
585 | return ax25_hard_header(skb, dev, type, daddr, saddr, len); | ||
586 | #endif | ||
587 | return 0; | ||
588 | } | ||
589 | |||
590 | |||
591 | static int ax_rebuild_header(struct sk_buff *skb) | ||
592 | { | ||
593 | #ifdef CONFIG_INET | ||
594 | return ax25_rebuild_header(skb); | ||
595 | #else | ||
596 | return 0; | ||
597 | #endif | ||
598 | } | ||
599 | |||
600 | #endif /* CONFIG_{AX25,AX25_MODULE} */ | ||
601 | |||
602 | /* Open the low-level part of the AX25 channel. Easy! */ | 576 | /* Open the low-level part of the AX25 channel. Easy! */ |
603 | static int ax_open(struct net_device *dev) | 577 | static int ax_open(struct net_device *dev) |
604 | { | 578 | { |
@@ -662,11 +636,6 @@ static int ax_close(struct net_device *dev) | |||
662 | return 0; | 636 | return 0; |
663 | } | 637 | } |
664 | 638 | ||
665 | static const struct header_ops ax_header_ops = { | ||
666 | .create = ax_header, | ||
667 | .rebuild = ax_rebuild_header, | ||
668 | }; | ||
669 | |||
670 | static const struct net_device_ops ax_netdev_ops = { | 639 | static const struct net_device_ops ax_netdev_ops = { |
671 | .ndo_open = ax_open_dev, | 640 | .ndo_open = ax_open_dev, |
672 | .ndo_stop = ax_close, | 641 | .ndo_stop = ax_close, |
@@ -682,7 +651,7 @@ static void ax_setup(struct net_device *dev) | |||
682 | dev->addr_len = 0; | 651 | dev->addr_len = 0; |
683 | dev->type = ARPHRD_AX25; | 652 | dev->type = ARPHRD_AX25; |
684 | dev->tx_queue_len = 10; | 653 | dev->tx_queue_len = 10; |
685 | dev->header_ops = &ax_header_ops; | 654 | dev->header_ops = &ax25_header_ops; |
686 | dev->netdev_ops = &ax_netdev_ops; | 655 | dev->netdev_ops = &ax_netdev_ops; |
687 | 656 | ||
688 | 657 | ||