diff options
| author | David S. Miller | 2010-09-22 01:00:40 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-09-22 01:00:40 +0200 |
| commit | 98e684bd5c927cb94ff23fb6f1dd34dd346a19cf (patch) | |
| tree | 4274d2b1d7c5314e1bb4d33197211aa8faa08687 /include/linux | |
| parent | sfc: Clean up and correct comments on efx_monitor() (diff) | |
| parent | dccp ccid-3: Remove redundant 'options_received' struct (diff) | |
| download | kernel-qcow2-linux-98e684bd5c927cb94ff23fb6f1dd34dd346a19cf.tar.gz kernel-qcow2-linux-98e684bd5c927cb94ff23fb6f1dd34dd346a19cf.tar.xz kernel-qcow2-linux-98e684bd5c927cb94ff23fb6f1dd34dd346a19cf.zip | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dccp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 7434a8353e23..7187bd8a75f6 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h @@ -165,8 +165,10 @@ enum { DCCPO_TIMESTAMP_ECHO = 42, DCCPO_ELAPSED_TIME = 43, DCCPO_MAX = 45, - DCCPO_MIN_CCID_SPECIFIC = 128, - DCCPO_MAX_CCID_SPECIFIC = 255, + DCCPO_MIN_RX_CCID_SPECIFIC = 128, /* from sender to receiver */ + DCCPO_MAX_RX_CCID_SPECIFIC = 191, + DCCPO_MIN_TX_CCID_SPECIFIC = 192, /* from receiver to sender */ + DCCPO_MAX_TX_CCID_SPECIFIC = 255, }; /* maximum size of a single TLV-encoded DCCP option (sans type/len bytes) */ #define DCCP_SINGLE_OPT_MAXLEN 253 |