diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-11 20:11:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-11 20:11:33 -0400 |
| commit | 3ee40c376ad3252d13946141588db7e2f435f958 (patch) | |
| tree | 65bd16c024edab1ff74ad165779443edfaa26467 /include | |
| parent | 670025478c2a687453cd1bac697d7d765843f59d (diff) | |
| parent | 98eb0f53e2fc66482e2ea8033c58b20a079e5260 (diff) | |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/wimax/i2400m.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h index d5148a7889a6..433693ef2bb0 100644 --- a/include/linux/wimax/i2400m.h +++ b/include/linux/wimax/i2400m.h | |||
| @@ -266,7 +266,7 @@ enum i2400m_ro_type { | |||
| 266 | 266 | ||
| 267 | /* Misc constants */ | 267 | /* Misc constants */ |
| 268 | enum { | 268 | enum { |
| 269 | I2400M_PL_PAD = 16, /* Payload data size alignment */ | 269 | I2400M_PL_ALIGN = 16, /* Payload data size alignment */ |
| 270 | I2400M_PL_SIZE_MAX = 0x3EFF, | 270 | I2400M_PL_SIZE_MAX = 0x3EFF, |
| 271 | I2400M_MAX_PLS_IN_MSG = 60, | 271 | I2400M_MAX_PLS_IN_MSG = 60, |
| 272 | /* protocol barkers: sync sequences; for notifications they | 272 | /* protocol barkers: sync sequences; for notifications they |