[AX.25]: Fix potencial memory hole.

[linux-2.6-omap-h63xx.git] / include / net / ax25.h

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 227d3378decd8cf86d8467652f6e9ebc9e3daec5..d052b221dbcd4b5ce124e9ee3a0c64358a2dbf1d 100644 (file)
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -26,11 +26,20 @@
 
 /* AX.25 Protocol IDs */
 #define AX25_P_ROSE                    0x01
-#define AX25_P_IP                      0xCC
-#define AX25_P_ARP                     0xCD
-#define AX25_P_TEXT                    0xF0
-#define AX25_P_NETROM                  0xCF
-#define        AX25_P_SEGMENT                  0x08
+#define AX25_P_VJCOMP                  0x06    /* Compressed TCP/IP packet   */
+                                               /* Van Jacobsen (RFC 1144)    */
+#define AX25_P_VJUNCOMP                        0x07    /* Uncompressed TCP/IP packet */
+                                               /* Van Jacobsen (RFC 1144)    */
+#define        AX25_P_SEGMENT                  0x08    /* Segmentation fragment      */
+#define AX25_P_TEXNET                  0xc3    /* TEXTNET datagram protocol  */
+#define AX25_P_LQ                      0xc4    /* Link Quality Protocol      */
+#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_FLEXNET                 0xce    /* FlexNet                    */
+#define AX25_P_NETROM                  0xcf    /* NET/ROM                    */
+#define AX25_P_TEXT                    0xF0    /* No layer 3 protocol impl.  */
 
 /* AX.25 Segment control values */
 #define        AX25_SEG_REM                    0x7F
@@ -88,11 +97,11 @@
 /* Define Link State constants. */
 
 enum { 
-       AX25_STATE_0,
-       AX25_STATE_1,
-       AX25_STATE_2,
-       AX25_STATE_3,
-       AX25_STATE_4
+       AX25_STATE_0,                   /* Listening */
+       AX25_STATE_1,                   /* SABM sent */
+       AX25_STATE_2,                   /* DISC sent */
+       AX25_STATE_3,                   /* Established */
+       AX25_STATE_4                    /* Recovery */
 };
 
 #define AX25_MODULUS           8       /*  Standard AX.25 modulus */
@@ -101,8 +110,15 @@ enum {
 enum {
        AX25_PROTO_STD_SIMPLEX,
        AX25_PROTO_STD_DUPLEX,
+#ifdef CONFIG_AX25_DAMA_SLAVE
        AX25_PROTO_DAMA_SLAVE,
-       AX25_PROTO_DAMA_MASTER
+#ifdef CONFIG_AX25_DAMA_MASTER
+       AX25_PROTO_DAMA_MASTER,
+#define AX25_PROTO_MAX AX25_PROTO_DAMA_MASTER
+#endif
+#endif
+       __AX25_PROTO_MAX,
+       AX25_PROTO_MAX = __AX25_PROTO_MAX -1
 };
 
 enum {
@@ -162,7 +178,7 @@ typedef struct {
        ax25_address            calls[AX25_MAX_DIGIS];
        unsigned char           repeated[AX25_MAX_DIGIS];
        unsigned char           ndigi;
-       char                    lastrepeat;
+       signed char             lastrepeat;
 } ax25_digi;
 
 typedef struct ax25_route {
@@ -228,8 +244,7 @@ typedef struct ax25_cb {
 static __inline__ void ax25_cb_put(ax25_cb *ax25)
 {
        if (atomic_dec_and_test(&ax25->refcount)) {
-               if (ax25->digipeat)
-                       kfree(ax25->digipeat);
+               kfree(ax25->digipeat);
                kfree(ax25);
        }
 }
@@ -319,7 +334,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 *);
 
 /* 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 *);
 
 /* ax25_out.c */