af_ax25.c (c346dca10840a874240c78efe3f39acf4312a1f2) | af_ax25.c (3b1e0a655f8eba44ab1ee2a1068d169ccfb853b9) |
---|---|
1/* 2 * This program is free software; you can redistribute it and/or modify 3 * it under the terms of the GNU General Public License as published by 4 * the Free Software Foundation; either version 2 of the License, or 5 * (at your option) any later version. 6 * 7 * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk) 8 * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) --- 855 unchanged lines hidden (view full) --- 864 return 0; 865} 866 867struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) 868{ 869 struct sock *sk; 870 ax25_cb *ax25, *oax25; 871 | 1/* 2 * This program is free software; you can redistribute it and/or modify 3 * it under the terms of the GNU General Public License as published by 4 * the Free Software Foundation; either version 2 of the License, or 5 * (at your option) any later version. 6 * 7 * Copyright (C) Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk) 8 * Copyright (C) Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk) --- 855 unchanged lines hidden (view full) --- 864 return 0; 865} 866 867struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) 868{ 869 struct sock *sk; 870 ax25_cb *ax25, *oax25; 871 |
872 sk = sk_alloc(osk->sk_net, PF_AX25, GFP_ATOMIC, osk->sk_prot); | 872 sk = sk_alloc(sock_net(osk), PF_AX25, GFP_ATOMIC, osk->sk_prot); |
873 if (sk == NULL) 874 return NULL; 875 876 if ((ax25 = ax25_create_cb()) == NULL) { 877 sk_free(sk); 878 return NULL; 879 } 880 --- 1162 unchanged lines hidden --- | 873 if (sk == NULL) 874 return NULL; 875 876 if ((ax25 = ax25_create_cb()) == NULL) { 877 sk_free(sk); 878 return NULL; 879 } 880 --- 1162 unchanged lines hidden --- |