Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256013
b: refs/heads/master
c: 075e191
h: refs/heads/master
i:
  256011: f38d40b
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Jul 1, 2011
1 parent 510805e commit 79a2314
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 06f8fe11bb4a84de9d9faa50c7ffbe40b90d395a
refs/heads/master: 075e1913e1fd7ef6dc8885fc844cfb6c48210104
23 changes: 10 additions & 13 deletions trunk/net/econet/af_econet.c
Original file line number Diff line number Diff line change
Expand Up @@ -720,23 +720,20 @@ static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
struct sock *sk = sock->sk;
void __user *argp = (void __user *)arg;

switch(cmd) {
case SIOCGSTAMP:
return sock_get_timestamp(sk, argp);
switch (cmd) {
case SIOCGSTAMP:
return sock_get_timestamp(sk, argp);

case SIOCGSTAMPNS:
return sock_get_timestampns(sk, argp);
case SIOCGSTAMPNS:
return sock_get_timestampns(sk, argp);

case SIOCSIFADDR:
case SIOCGIFADDR:
return ec_dev_ioctl(sock, cmd, argp);
break;
case SIOCSIFADDR:
case SIOCGIFADDR:
return ec_dev_ioctl(sock, cmd, argp);

default:
return -ENOIOCTLCMD;
}
/*NOTREACHED*/
return 0;

return -ENOIOCTLCMD;
}

static const struct net_proto_family econet_family_ops = {
Expand Down

0 comments on commit 79a2314

Please sign in to comment.