ax25/6pack: Replace sp_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>

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index daca0dee88f3634570ab6cf984e80066bd331341..2533933c79dc3bcb7782d6ca8f1a4206ad50eabe 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -284,18 +284,6 @@ static int sp_close(struct net_device *dev)
        return 0;
 }
 
-/* Return the frame type ID */
-static int sp_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 sp_set_mac_address(struct net_device *dev, void *addr)
 {
        struct sockaddr_ax25 *sa = addr;
@@ -309,20 +297,6 @@ static int sp_set_mac_address(struct net_device *dev, void *addr)
        return 0;
 }
 
-static int sp_rebuild_header(struct sk_buff *skb)
-{
-#ifdef CONFIG_INET
-       return ax25_rebuild_header(skb);
-#else
-       return 0;
-#endif
-}
-
-static const struct header_ops sp_header_ops = {
-       .create         = sp_header,
-       .rebuild        = sp_rebuild_header,
-};
-
 static const struct net_device_ops sp_netdev_ops = {
        .ndo_open               = sp_open_dev,
        .ndo_stop               = sp_close,
@@ -337,7 +311,7 @@ static void sp_setup(struct net_device *dev)
        dev->destructor         = free_netdev;
        dev->mtu                = SIXP_MTU;
        dev->hard_header_len    = AX25_MAX_HEADER_LEN;
-       dev->header_ops         = &sp_header_ops;
+       dev->header_ops         = &ax25_header_ops;
 
        dev->addr_len           = AX25_ADDR_LEN;
        dev->type               = ARPHRD_AX25;