diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/rxrpc/packet.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 */ |