diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 15:58:23 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 15:58:23 +0200 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/net/ax25.h | |
| parent | Merge Linux 2.6.23 (diff) | |
| parent | x86/pci/acpi: fix DMI const-ification fallout (diff) | |
| download | linux-ebf8889bd1fe3615991ff4494635d237280652a2.tar.xz linux-ebf8889bd1fe3615991ff4494635d237280652a2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/ax25.h')
| -rw-r--r-- | include/net/ax25.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 99a4e364c74a..4e3cd93f81fc 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -363,8 +363,11 @@ 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 *); /* ax25_ip.c */ -extern int ax25_hard_header(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, const void *, + const void *, unsigned int); extern int ax25_rebuild_header(struct sk_buff *); +extern const struct header_ops ax25_header_ops; /* ax25_out.c */ extern ax25_cb *ax25_send_frame(struct sk_buff *, int, ax25_address *, ax25_address *, ax25_digi *, struct net_device *); |