netfilter: nf_conntrack: fix hash resizing with namespaces

[safe/jmp/linux-2.6] / net / can / bcm.c

diff --git a/net/can/bcm.c b/net/can/bcm.c
index e8d58f3..e32af52 100644 (file)
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -139,13 +139,13 @@ static char *bcm_proc_getifname(char *result, int ifindex)
        if (!ifindex)
                return "any";
 
-       read_lock(&dev_base_lock);
-       dev = __dev_get_by_index(&init_net, ifindex);
+       rcu_read_lock();
+       dev = dev_get_by_index_rcu(&init_net, ifindex);
        if (dev)
                strcpy(result, dev->name);
        else
                strcpy(result, "???");
-       read_unlock(&dev_base_lock);
+       rcu_read_unlock();
 
        return result;
 }
@@ -1539,7 +1539,7 @@ static int bcm_recvmsg(struct kiocb *iocb, struct socket *sock,
                return err;
        }
 
-       sock_recv_timestamp(msg, sk, skb);
+       sock_recv_ts_and_drops(msg, sk, skb);
 
        if (msg->msg_name) {
                msg->msg_namelen = sizeof(struct sockaddr_can);
@@ -1581,7 +1581,6 @@ static struct proto bcm_proto __read_mostly = {
 static struct can_proto bcm_can_proto __read_mostly = {
        .type       = SOCK_DGRAM,
        .protocol   = CAN_BCM,
-       .capability = -1,
        .ops        = &bcm_ops,
        .prot       = &bcm_proto,
 };