diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
| commit | abaee091a18c19ccd86feb1c8374585d82e96777 (patch) | |
| tree | 01602bae73e1278c3d98dafe1c269049927c58ce /include/linux/netdevice.h | |
| parent | a2746fb16e41b7c8f02aa4d2605ecce97abbebbd (diff) | |
| parent | 3f8d6f2a0797e8c650a47e5c1b5c2601a46f4293 (diff) | |
Merge branch 'jejb-scsi' into misc
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 67bfac1abfc1..3b5d134e945a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -1398,7 +1398,8 @@ enum netdev_priv_flags { | |||
| 1398 | * @dma: DMA channel | 1398 | * @dma: DMA channel |
| 1399 | * @mtu: Interface MTU value | 1399 | * @mtu: Interface MTU value |
| 1400 | * @type: Interface hardware type | 1400 | * @type: Interface hardware type |
| 1401 | * @hard_header_len: Hardware header length | 1401 | * @hard_header_len: Hardware header length, which means that this is the |
| 1402 | * minimum size of a packet. | ||
| 1402 | * | 1403 | * |
| 1403 | * @needed_headroom: Extra headroom the hardware may need, but not in all | 1404 | * @needed_headroom: Extra headroom the hardware may need, but not in all |
| 1404 | * cases can this be guaranteed | 1405 | * cases can this be guaranteed |