diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 07:12:41 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 07:12:41 (GMT) |
| commit | 09f68072b32089f2e3b4749161eb3ce954faf8d4 (patch) | |
| tree | b8b3c84f8a9c7150c2d830428daa3d641917ecf3 /net/can/raw.c | |
| parent | d454f39f3ff3ee5a818c271026081a48a537bd41 (diff) | |
| parent | ef49e4fae3f364af8da041dcc1bb4931c749b3da (diff) | |
| download | linux-09f68072b32089f2e3b4749161eb3ce954faf8d4.tar.xz | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'net/can/raw.c')
| -rw-r--r-- | net/can/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index 883e9d7..649acfa 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -742,7 +742,7 @@ static int raw_recvmsg(struct kiocb *iocb, struct socket *sock, return size; } -static struct proto_ops raw_ops __read_mostly = { +static const struct proto_ops raw_ops = { .family = PF_CAN, .release = raw_release, .bind = raw_bind, @@ -751,7 +751,7 @@ static struct proto_ops raw_ops __read_mostly = { .accept = sock_no_accept, .getname = raw_getname, .poll = datagram_poll, - .ioctl = NULL, /* use can_ioctl() from af_can.c */ + .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */ .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = raw_setsockopt, |