diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 17:03:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 17:03:09 -0400 |
| commit | 14d8ce70d5c2634982ca564039466bce70f4ff18 (patch) | |
| tree | 4165b27d1b06152d141d2fea12bce10efc8e7c4f /include/linux | |
| parent | 79121839aad7153907b92462759675266f1f2ac4 (diff) | |
| parent | b3dd65f958354226275522b5a64157834bdc5415 (diff) | |
| download | op-kernel-dev-14d8ce70d5c2634982ca564039466bce70f4ff18.zip op-kernel-dev-14d8ce70d5c2634982ca564039466bce70f4ff18.tar.gz | |
Automatic merge of /spare/repo/netdev-2.6 branch hdlc
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hdlc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h index 503194e..ed2927e 100644 --- a/include/linux/hdlc.h +++ b/include/linux/hdlc.h @@ -1,7 +1,7 @@ /* * Generic HDLC support routines for Linux * - * Copyright (C) 1999-2003 Krzysztof Halasa <khc@pm.waw.pl> + * Copyright (C) 1999-2005 Krzysztof Halasa <khc@pm.waw.pl> * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License @@ -41,6 +41,7 @@ #define LMI_NONE 1 /* No LMI, all PVCs are static */ #define LMI_ANSI 2 /* ANSI Annex D */ #define LMI_CCITT 3 /* ITU-T Annex A */ +#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ #define HDLC_MAX_MTU 1500 /* Ethernet 1500 bytes */ #define HDLC_MAX_MRU (HDLC_MAX_MTU + 10 + 14 + 4) /* for ETH+VLAN over FR */ @@ -89,6 +90,7 @@ typedef struct pvc_device_struct { unsigned int deleted: 1; unsigned int fecn: 1; unsigned int becn: 1; + unsigned int bandwidth; /* Cisco LMI reporting only */ }state; }pvc_device; |
