Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[firefly-linux-kernel-4.4.55.git] / include / net / x25.h

diff --git a/include/net/x25.h b/include/net/x25.h
index fc3f03d976f8782fc6e4d4d45e18b0775ab1d0e7..2cda0401156874213972853e7c2a1cbb19f00a06 100644 (file)
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -187,7 +187,7 @@ extern int  x25_addr_ntoa(unsigned char *, struct x25_address *,
 extern int  x25_addr_aton(unsigned char *, struct x25_address *,
                          struct x25_address *);
 extern struct sock *x25_find_socket(unsigned int, struct x25_neigh *);
-extern void x25_destroy_socket(struct sock *);
+extern void x25_destroy_socket_from_timer(struct sock *);
 extern int  x25_rx_call_request(struct sk_buff *, struct x25_neigh *, unsigned int);
 extern void x25_kill_by_neigh(struct x25_neigh *);