mirror of
https://github.com/torvalds/linux.git
synced 2024-09-20 15:03:04 +00:00
[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:
parent
c4bc7ee2e4
commit
6f74998e5c
|
@ -293,7 +293,7 @@ static int sp_header(struct sk_buff *skb, struct net_device *dev,
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_INET
|
#ifdef CONFIG_INET
|
||||||
if (type != htons(ETH_P_AX25))
|
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
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1171,7 +1171,7 @@ static void baycom_probe(struct net_device *dev)
|
||||||
/* Fill in the fields of the device structure */
|
/* Fill in the fields of the device structure */
|
||||||
bc->skb = NULL;
|
bc->skb = NULL;
|
||||||
|
|
||||||
dev->hard_header = ax25_encapsulate;
|
dev->hard_header = ax25_hard_header;
|
||||||
dev->rebuild_header = ax25_rebuild_header;
|
dev->rebuild_header = ax25_rebuild_header;
|
||||||
dev->set_mac_address = baycom_set_mac_address;
|
dev->set_mac_address = baycom_set_mac_address;
|
||||||
|
|
||||||
|
|
|
@ -488,7 +488,7 @@ static void bpq_setup(struct net_device *dev)
|
||||||
dev->flags = 0;
|
dev->flags = 0;
|
||||||
|
|
||||||
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
#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;
|
dev->rebuild_header = ax25_rebuild_header;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -600,7 +600,7 @@ static int __init setup_adapter(int card_base, int type, int n)
|
||||||
dev->do_ioctl = scc_ioctl;
|
dev->do_ioctl = scc_ioctl;
|
||||||
dev->hard_start_xmit = scc_send_packet;
|
dev->hard_start_xmit = scc_send_packet;
|
||||||
dev->get_stats = scc_get_stats;
|
dev->get_stats = scc_get_stats;
|
||||||
dev->hard_header = ax25_encapsulate;
|
dev->hard_header = ax25_hard_header;
|
||||||
dev->rebuild_header = ax25_rebuild_header;
|
dev->rebuild_header = ax25_rebuild_header;
|
||||||
dev->set_mac_address = scc_set_mac_address;
|
dev->set_mac_address = scc_set_mac_address;
|
||||||
}
|
}
|
||||||
|
|
|
@ -701,7 +701,7 @@ static void hdlcdrv_setup(struct net_device *dev)
|
||||||
|
|
||||||
s->skb = NULL;
|
s->skb = NULL;
|
||||||
|
|
||||||
dev->hard_header = ax25_encapsulate;
|
dev->hard_header = ax25_hard_header;
|
||||||
dev->rebuild_header = ax25_rebuild_header;
|
dev->rebuild_header = ax25_rebuild_header;
|
||||||
dev->set_mac_address = hdlcdrv_set_mac_address;
|
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
|
#ifdef CONFIG_INET
|
||||||
if (type != htons(ETH_P_AX25))
|
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
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1557,7 +1557,7 @@ static void scc_net_setup(struct net_device *dev)
|
||||||
dev->stop = scc_net_close;
|
dev->stop = scc_net_close;
|
||||||
|
|
||||||
dev->hard_start_xmit = scc_net_tx;
|
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->rebuild_header = ax25_rebuild_header;
|
||||||
dev->set_mac_address = scc_net_set_mac_address;
|
dev->set_mac_address = scc_net_set_mac_address;
|
||||||
dev->get_stats = scc_net_get_stats;
|
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);
|
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->rebuild_header = ax25_rebuild_header;
|
||||||
|
|
||||||
dev->set_mac_address = yam_set_mac_address;
|
dev->set_mac_address = yam_set_mac_address;
|
||||||
|
|
|
@ -319,7 +319,7 @@ extern int ax25_rx_iframe(ax25_cb *, struct sk_buff *);
|
||||||
extern int ax25_kiss_rcv(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
|
extern int ax25_kiss_rcv(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
|
||||||
|
|
||||||
/* ax25_ip.c */
|
/* ax25_ip.c */
|
||||||
extern int ax25_encapsulate(struct sk_buff *, struct net_device *, unsigned short, void *, void *, unsigned int);
|
extern int ax25_hard_header(struct sk_buff *, struct net_device *, unsigned short, void *, void *, unsigned int);
|
||||||
extern int ax25_rebuild_header(struct sk_buff *);
|
extern int ax25_rebuild_header(struct sk_buff *);
|
||||||
|
|
||||||
/* ax25_out.c */
|
/* ax25_out.c */
|
||||||
|
|
|
@ -1984,7 +1984,7 @@ static struct notifier_block ax25_dev_notifier = {
|
||||||
.notifier_call =ax25_device_event,
|
.notifier_call =ax25_device_event,
|
||||||
};
|
};
|
||||||
|
|
||||||
EXPORT_SYMBOL(ax25_encapsulate);
|
EXPORT_SYMBOL(ax25_hard_header);
|
||||||
EXPORT_SYMBOL(ax25_rebuild_header);
|
EXPORT_SYMBOL(ax25_rebuild_header);
|
||||||
EXPORT_SYMBOL(ax25_findbyuid);
|
EXPORT_SYMBOL(ax25_findbyuid);
|
||||||
EXPORT_SYMBOL(ax25_find_cb);
|
EXPORT_SYMBOL(ax25_find_cb);
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
|
|
||||||
#ifdef CONFIG_INET
|
#ifdef CONFIG_INET
|
||||||
|
|
||||||
int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
|
int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
|
||||||
{
|
{
|
||||||
unsigned char *buff;
|
unsigned char *buff;
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short
|
||||||
*buff++ = AX25_P_ARP;
|
*buff++ = AX25_P_ARP;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
printk(KERN_ERR "AX.25: ax25_encapsulate - wrong protocol type 0x%2.2x\n", type);
|
printk(KERN_ERR "AX.25: ax25_hard_header - wrong protocol type 0x%2.2x\n", type);
|
||||||
*buff++ = 0;
|
*buff++ = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -209,7 +209,7 @@ put:
|
||||||
|
|
||||||
#else /* INET */
|
#else /* INET */
|
||||||
|
|
||||||
int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
|
int ax25_hard_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len)
|
||||||
{
|
{
|
||||||
return -AX25_HEADER_LEN;
|
return -AX25_HEADER_LEN;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user