diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
| commit | 81e53d0470878165a300d75ac06a5bc5eee543a2 (patch) | |
| tree | 5fdaacfb350c5a290109f98ab29e9858f1f11469 /include/linux/usb/wusb.h | |
| parent | 15e0964dc2a097de3cf518badf2237b6b6adf7fe (diff) | |
| parent | fcb4ed749c776a2ae89ca40343cbccb6f8981e60 (diff) | |
Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
Diffstat (limited to 'include/linux/usb/wusb.h')
| -rw-r--r-- | include/linux/usb/wusb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h index 0c4d4ca370e..eeb28329fa3 100644 --- a/include/linux/usb/wusb.h +++ b/include/linux/usb/wusb.h @@ -271,6 +271,8 @@ static inline u8 wusb_key_index(int index, int type, int originator) #define WUSB_KEY_INDEX_TYPE_GTK 2 #define WUSB_KEY_INDEX_ORIGINATOR_HOST 0 #define WUSB_KEY_INDEX_ORIGINATOR_DEVICE 1 +/* bits 0-3 used for the key index. */ +#define WUSB_KEY_INDEX_MAX 15 /* A CCM Nonce, defined in WUSB1.0[6.4.1] */ struct aes_ccm_nonce { |