diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-11-30 18:47:00 +0100 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-11-30 18:47:00 +0100 |
| commit | 0eda0e16d9e63d82b6dd96b6abe7042d50b6b308 (patch) | |
| tree | 3a31216571ca15c7cd9ea57f83e0e7b4cdfc3f9c | |
| parent | 5eccbc32899a5e083700fc0ee4574a4a3f86d6ff (diff) | |
| parent | 1bc8649e4645cce8e37151a899cedf8ee44dbdaa (diff) | |
| download | kernel-crypto-integration.tar.gz kernel-crypto-integration.tar.xz kernel-crypto-integration.zip | |
Merge branch 'bugfixes' into integrationintegration
| -rw-r--r-- | crypto/af_alg.c | 1 | ||||
| -rw-r--r-- | include/linux/Kbuild | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 450d51abe84..31f2b224ae4 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -312,6 +312,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) goto unlock; sock_init_data(newsock, sk2); + sock_graft(sk2, newsock); err = type->accept(ask->private, sk2); if (err) { diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 9aa9bcadf86..60db44c0878 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -81,6 +81,7 @@ header-y += hysdn_if.h header-y += i2o-dev.h header-y += i8k.h header-y += if_addrlabel.h +header-y += if_alg.h header-y += if_arcnet.h header-y += if_bonding.h header-y += if_cablemodem.h |