diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-12 14:21:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-09-12 14:21:01 -0700 |
| commit | 6f74998e5c3b4610e6eba06babf16547369c512a (patch) | |
| tree | f9a0209a38f508862a762861f79b58c23a05351c /net/ax25 | |
| parent | c4bc7ee2e474819d3932e8d726fdf7cb0bdc00c1 (diff) | |
| download | linux-3.10-6f74998e5c3b4610e6eba06babf16547369c512a.tar.gz linux-3.10-6f74998e5c3b4610e6eba06babf16547369c512a.tar.bz2 linux-3.10-6f74998e5c3b4610e6eba06babf16547369c512a.zip | |
[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>
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/af_ax25.c | 2 | ||||
| -rw-r--r-- | net/ax25/ax25_ip.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index ed705ddad56..17f192b7786 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -1984,7 +1984,7 @@ static struct notifier_block ax25_dev_notifier = { .notifier_call =ax25_device_event, }; -EXPORT_SYMBOL(ax25_encapsulate); +EXPORT_SYMBOL(ax25_hard_header); EXPORT_SYMBOL(ax25_rebuild_header); EXPORT_SYMBOL(ax25_findbyuid); EXPORT_SYMBOL(ax25_find_cb); diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c index bba0173e2d6..d643dac3ecc 100644 --- a/net/ax25/ax25_ip.c +++ b/net/ax25/ax25_ip.c @@ -47,7 +47,7 @@ #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; @@ -88,7 +88,7 @@ int ax25_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short *buff++ = AX25_P_ARP; break; 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; break; } @@ -209,7 +209,7 @@ put: #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; } |