diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 11:42:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 11:42:35 -0700 |
| commit | 0e396ee43e445cb7c215a98da4e76d0ce354d9d7 (patch) | |
| tree | a6fde6a33965abb6077420cda31e3f1fbe8d3891 /include/linux/hdlc.h | |
| parent | b8112df71cae7d6a86158caeb19d215f56c4f9ab (diff) | |
| parent | 2089a0d38bc9c2cdd084207ebf7082b18cf4bf58 (diff) | |
| download | op-kernel-dev-0e396ee43e445cb7c215a98da4e76d0ce354d9d7.zip op-kernel-dev-0e396ee43e445cb7c215a98da4e76d0ce354d9d7.tar.gz | |
Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
This is a fixed-up version of the broken "upstream-2.6.13" branch, where
I re-did the manual merge of drivers/net/r8169.c by hand, and made sure
the history is all good.
Diffstat (limited to 'include/linux/hdlc.h')
| -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; |
