[AX.25]: Rename ax25_encapsulate to ax25_hard_header
Rename ax25_encapsulate to ax25_hard_header which these days more accurately describes what the function is supposed to do. Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
c4bc7ee2e4
commit
6f74998e5c
@@ -293,7 +293,7 @@ static int sp_header(struct sk_buff *skb, struct net_device *dev,
|
||||
{
|
||||
#ifdef CONFIG_INET
|
||||
if (type != htons(ETH_P_AX25))
|
||||
return ax25_encapsulate(skb, dev, type, daddr, saddr, len);
|
||||
return ax25_hard_header(skb, dev, type, daddr, saddr, len);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
@@ -1171,7 +1171,7 @@ static void baycom_probe(struct net_device *dev)
|
||||
/* Fill in the fields of the device structure */
|
||||
bc->skb = NULL;
|
||||
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->hard_header = ax25_hard_header;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
dev->set_mac_address = baycom_set_mac_address;
|
||||
|
||||
|
@@ -488,7 +488,7 @@ static void bpq_setup(struct net_device *dev)
|
||||
dev->flags = 0;
|
||||
|
||||
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->hard_header = ax25_hard_header;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
#endif
|
||||
|
||||
|
@@ -600,7 +600,7 @@ static int __init setup_adapter(int card_base, int type, int n)
|
||||
dev->do_ioctl = scc_ioctl;
|
||||
dev->hard_start_xmit = scc_send_packet;
|
||||
dev->get_stats = scc_get_stats;
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->hard_header = ax25_hard_header;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
dev->set_mac_address = scc_set_mac_address;
|
||||
}
|
||||
|
@@ -701,7 +701,7 @@ static void hdlcdrv_setup(struct net_device *dev)
|
||||
|
||||
s->skb = NULL;
|
||||
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->hard_header = ax25_hard_header;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
dev->set_mac_address = hdlcdrv_set_mac_address;
|
||||
|
||||
|
@@ -500,7 +500,7 @@ static int ax_header(struct sk_buff *skb, struct net_device *dev, unsigned short
|
||||
{
|
||||
#ifdef CONFIG_INET
|
||||
if (type != htons(ETH_P_AX25))
|
||||
return ax25_encapsulate(skb, dev, type, daddr, saddr, len);
|
||||
return ax25_hard_header(skb, dev, type, daddr, saddr, len);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
@@ -1557,7 +1557,7 @@ static void scc_net_setup(struct net_device *dev)
|
||||
dev->stop = scc_net_close;
|
||||
|
||||
dev->hard_start_xmit = scc_net_tx;
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->hard_header = ax25_hard_header;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
dev->set_mac_address = scc_net_set_mac_address;
|
||||
dev->get_stats = scc_net_get_stats;
|
||||
|
@@ -1108,7 +1108,7 @@ static void yam_setup(struct net_device *dev)
|
||||
|
||||
skb_queue_head_init(&yp->send_queue);
|
||||
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->hard_header = ax25_hard_header;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
|
||||
dev->set_mac_address = yam_set_mac_address;
|
||||
|
Reference in New Issue
Block a user