← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to net/ax25/af_ax25.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ax25/af_ax25.c
538
538
        if (level != SOL_AX25)
539
539
                return -ENOPROTOOPT;
540
540
 
541
 
        if (optlen < (int)sizeof(int))
 
541
        if (optlen < sizeof(int))
542
542
                return -EINVAL;
543
543
 
544
544
        if (get_user(opt, (int __user *)optval))
893
893
 
894
894
        sock_init_data(NULL, sk);
895
895
 
 
896
        sk->sk_destruct = ax25_free_sock;
896
897
        sk->sk_type     = osk->sk_type;
897
898
        sk->sk_priority = osk->sk_priority;
898
899
        sk->sk_protocol = osk->sk_protocol;
930
931
        }
931
932
 
932
933
        sk->sk_protinfo = ax25;
933
 
        sk->sk_destruct = ax25_free_sock;
934
934
        ax25->sk    = sk;
935
935
 
936
936
        return sk;
1781
1781
                ax25_info.idletimer = ax25_display_timer(&ax25->idletimer) / (60 * HZ);
1782
1782
                ax25_info.n2count   = ax25->n2count;
1783
1783
                ax25_info.state     = ax25->state;
1784
 
                ax25_info.rcv_q     = sk_rmem_alloc_get(sk);
1785
 
                ax25_info.snd_q     = sk_wmem_alloc_get(sk);
 
1784
                ax25_info.rcv_q     = sk_wmem_alloc_get(sk);
 
1785
                ax25_info.snd_q     = sk_rmem_alloc_get(sk);
1786
1786
                ax25_info.vs        = ax25->vs;
1787
1787
                ax25_info.vr        = ax25->vr;
1788
1788
                ax25_info.va        = ax25->va;