Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / include / net / ax25.h

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 99a4e364c74ae6db4efa55849890617e11cc7258..32a57e1dee3a4f526cc43491b909948b55d0c6d1 100644 (file)
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -35,7 +35,7 @@
 #define AX25_P_ATALK                   0xca    /* Appletalk                  */
 #define AX25_P_ATALK_ARP               0xcb    /* Appletalk ARP              */
 #define AX25_P_IP                      0xcc    /* ARPA Internet Protocol     */
-#define AX25_P_ARP                     0xcd    /* ARPA Adress Resolution     */
+#define AX25_P_ARP                     0xcd    /* ARPA Address Resolution    */
 #define AX25_P_FLEXNET                 0xce    /* FlexNet                    */
 #define AX25_P_NETROM                  0xcf    /* NET/ROM                    */
 #define AX25_P_TEXT                    0xF0    /* No layer 3 protocol impl.  */
@@ -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 *);