diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/rxrpc/packet.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/rxrpc/packet.h')
| -rw-r--r-- | include/rxrpc/packet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rxrpc/packet.h b/include/rxrpc/packet.h index 9b2c30897e50..f2902ef7ab75 100644 --- a/include/rxrpc/packet.h +++ b/include/rxrpc/packet.h | |||
| @@ -148,7 +148,7 @@ struct rxkad_challenge { | |||
| 148 | * Kerberos security type-2 response packet | 148 | * Kerberos security type-2 response packet |
| 149 | */ | 149 | */ |
| 150 | struct rxkad_response { | 150 | struct rxkad_response { |
| 151 | __be32 version; /* version of this reponse type */ | 151 | __be32 version; /* version of this response type */ |
| 152 | __be32 __pad; | 152 | __be32 __pad; |
| 153 | 153 | ||
| 154 | /* encrypted bit of the response */ | 154 | /* encrypted bit of the response */ |