diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/linux/if_ether.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/linux/if_ether.h')
| -rw-r--r-- | include/linux/if_ether.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 1db774cf9dc2..3213f6f4aa58 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ | 33 | #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ |
| 34 | #define ETH_DATA_LEN 1500 /* Max. octets in payload */ | 34 | #define ETH_DATA_LEN 1500 /* Max. octets in payload */ |
| 35 | #define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ | 35 | #define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ |
| 36 | #define ETH_FCS_LEN 4 /* Octets in the FCS */ | ||
| 36 | 37 | ||
| 37 | /* | 38 | /* |
| 38 | * These are the defined Ethernet Protocol ID's. | 39 | * These are the defined Ethernet Protocol ID's. |