V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bit

[safe/jmp/linux-2.6] / drivers / net / pppol2tp.c

diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 442c382..449a982 100644 (file)
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -756,6 +756,7 @@ static int pppol2tp_recv_core(struct sock *sock, struct sk_buff *skb)
 
        /* Try to dequeue as many skbs from reorder_q as we can. */
        pppol2tp_recv_dequeue(session);
+       sock_put(sock);
 
        return 0;
 
@@ -772,6 +773,7 @@ discard_bad_csum:
        UDP_INC_STATS_USER(&init_net, UDP_MIB_INERRORS, 0);
        tunnel->stats.rx_errors++;
        kfree_skb(skb);
+       sock_put(sock);
 
        return 0;
 
@@ -1180,7 +1182,8 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
        /* Calculate UDP checksum if configured to do so */
        if (sk_tun->sk_no_check == UDP_CSUM_NOXMIT)
                skb->ip_summed = CHECKSUM_NONE;
-       else if (!(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM)) {
+       else if ((skb_dst(skb) && skb_dst(skb)->dev) &&
+                (!(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM))) {
                skb->ip_summed = CHECKSUM_COMPLETE;
                csum = skb_checksum(skb, 0, udp_len, 0);
                uh->check = csum_tcpudp_magic(inet->inet_saddr,
@@ -1537,7 +1540,7 @@ static struct sock *pppol2tp_prepare_tunnel_socket(struct net *net,
         * if the tunnel socket goes away.
         */
        tunnel->old_sk_destruct = sk->sk_destruct;
-       sk->sk_destruct = &pppol2tp_tunnel_destruct;
+       sk->sk_destruct = pppol2tp_tunnel_destruct;
 
        tunnel->sock = sk;
        sk->sk_allocation = GFP_ATOMIC;
@@ -1661,6 +1664,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
                if (tunnel_sock == NULL)
                        goto end;
 
+               sock_hold(tunnel_sock);
                tunnel = tunnel_sock->sk_user_data;
        } else {
                tunnel = pppol2tp_tunnel_find(sock_net(sk), sp->pppol2tp.s_tunnel);
@@ -2605,53 +2609,31 @@ static struct pppox_proto pppol2tp_proto = {
 
 static __net_init int pppol2tp_init_net(struct net *net)
 {
-       struct pppol2tp_net *pn;
+       struct pppol2tp_net *pn = pppol2tp_pernet(net);
        struct proc_dir_entry *pde;
-       int err;
-
-       pn = kzalloc(sizeof(*pn), GFP_KERNEL);
-       if (!pn)
-               return -ENOMEM;
 
        INIT_LIST_HEAD(&pn->pppol2tp_tunnel_list);
        rwlock_init(&pn->pppol2tp_tunnel_list_lock);
 
-       err = net_assign_generic(net, pppol2tp_net_id, pn);
-       if (err)
-               goto out;
-
        pde = proc_net_fops_create(net, "pppol2tp", S_IRUGO, &pppol2tp_proc_fops);
 #ifdef CONFIG_PROC_FS
-       if (!pde) {
-               err = -ENOMEM;
-               goto out;
-       }
+       if (!pde)
+               return -ENOMEM;
 #endif
 
        return 0;
-
-out:
-       kfree(pn);
-       return err;
 }
 
 static __net_exit void pppol2tp_exit_net(struct net *net)
 {
-       struct pppoe_net *pn;
-
        proc_net_remove(net, "pppol2tp");
-       pn = net_generic(net, pppol2tp_net_id);
-       /*
-        * if someone has cached our net then
-        * further net_generic call will return NULL
-        */
-       net_assign_generic(net, pppol2tp_net_id, NULL);
-       kfree(pn);
 }
 
 static struct pernet_operations pppol2tp_net_ops = {
        .init = pppol2tp_init_net,
        .exit = pppol2tp_exit_net,
+       .id   = &pppol2tp_net_id,
+       .size = sizeof(struct pppol2tp_net),
 };
 
 static int __init pppol2tp_init(void)
@@ -2665,7 +2647,7 @@ static int __init pppol2tp_init(void)
        if (err)
                goto out_unregister_pppol2tp_proto;
 
-       err = register_pernet_gen_device(&pppol2tp_net_id, &pppol2tp_net_ops);
+       err = register_pernet_device(&pppol2tp_net_ops);
        if (err)
                goto out_unregister_pppox_proto;
 
@@ -2684,7 +2666,7 @@ out_unregister_pppol2tp_proto:
 static void __exit pppol2tp_exit(void)
 {
        unregister_pppox_proto(PX_PROTO_OL2TP);
-       unregister_pernet_gen_device(pppol2tp_net_id, &pppol2tp_net_ops);
+       unregister_pernet_device(&pppol2tp_net_ops);
        proto_unregister(&pppol2tp_sk_proto);
 }