diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-31 13:13:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-31 13:13:24 -0800 |
| commit | 5403c8a29521a6eb02f9283dbbe0184527f8f42b (patch) | |
| tree | 4f1ca17feda4dfa88f53eceeaa39583ec840d27e /include/net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (diff) | |
| parent | bnx2x: Update bnx2x version to 1.62.00-5 (diff) | |
| download | linux-dev-5403c8a29521a6eb02f9283dbbe0184527f8f42b.tar.xz linux-dev-5403c8a29521a6eb02f9283dbbe0184527f8f42b.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index ba6465bf7c7a..e3893a2b5d25 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -753,6 +753,8 @@ struct proto { int level, int optname, char __user *optval, int __user *option); + int (*compat_ioctl)(struct sock *sk, + unsigned int cmd, unsigned long arg); #endif int (*sendmsg)(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, size_t len); |