diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/rxrpc/packet.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.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 9b2c30897e5..f2902ef7ab7 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 */ |