Messages in this thread Patch in this message |  | | From | Keith Owens <> | Subject | 2.1.21-patch_net-1 | Date | Wed, 15 Jan 1997 18:43:40 +1100 |
| |
Fix 802/Makefile and llc_macinit.c, llc_macinit exports symbols.
Changed def_callback3 in several sources to match sk->write_space.
rose/af_rose.c was calling def_callback1 for write_space instead of def_callback3, changed to def_callback3. AC - is this correct?
diff -ur linux-2.1.21.orig/net/802/Makefile linux/net/802/Makefile --- linux-2.1.21.orig/net/802/Makefile Fri Dec 13 01:54:22 1996 +++ linux/net/802/Makefile Wed Jan 15 11:37:33 1997 @@ -12,7 +12,8 @@ ifeq ($(CONFIG_LLC),y) SUB_DIRS += transit -O_OBJS += llc_macinit.o llc_sendpdu.o llc_utility.o cl2llc.o +O_OBJS += llc_sendpdu.o llc_utility.o cl2llc.o +OX_OBJS += llc_macinit.o endif diff -ur linux-2.1.21.orig/net/802/llc_macinit.c linux/net/802/llc_macinit.c --- linux-2.1.21.orig/net/802/llc_macinit.c Fri Jan 3 00:13:27 1997 +++ linux/net/802/llc_macinit.c Wed Jan 15 11:17:25 1997 @@ -19,6 +19,7 @@ * Started restructuring handlers */ +#include <linux/config.h> #include <linux/module.h> #include <linux/version.h> #include <linux/kernel.h> diff -ur linux-2.1.21.orig/net/ax25/af_ax25.c linux/net/ax25/af_ax25.c --- linux-2.1.21.orig/net/ax25/af_ax25.c Fri Jan 3 00:13:28 1997 +++ linux/net/ax25/af_ax25.c Wed Jan 15 14:34:55 1997 @@ -1101,7 +1101,7 @@ } } -static void def_callback3(struct sock *sk, int len) +static void def_callback3(struct sock *sk) { if (!sk->dead) { diff -ur linux-2.1.21.orig/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c --- linux-2.1.21.orig/net/ipx/af_ipx.c Wed Jan 15 13:02:59 1997 +++ linux/net/ipx/af_ipx.c Wed Jan 15 14:29:31 1997 @@ -1792,7 +1792,7 @@ } } -static void def_callback3(struct sock *sk, int len) +static void def_callback3(struct sock *sk) { if(!sk->dead) { diff -ur linux-2.1.21.orig/net/netbeui/netbeui.c linux/net/netbeui/netbeui.c --- linux-2.1.21.orig/net/netbeui/netbeui.c Fri Jan 3 00:13:29 1997 +++ linux/net/netbeui/netbeui.c Wed Jan 15 14:36:14 1997 @@ -284,7 +284,7 @@ } } -static void def_callback3(struct sock *sk, int len) +static void def_callback3(struct sock *sk) { if(!sk->dead) { diff -ur linux-2.1.21.orig/net/netrom/af_netrom.c linux/net/netrom/af_netrom.c --- linux-2.1.21.orig/net/netrom/af_netrom.c Fri Jan 3 00:13:29 1997 +++ linux/net/netrom/af_netrom.c Wed Jan 15 14:30:11 1997 @@ -580,7 +580,7 @@ } } -static void def_callback3(struct sock *sk, int len) +static void def_callback3(struct sock *sk) { if (!sk->dead) { diff -ur linux-2.1.21.orig/net/rose/af_rose.c linux/net/rose/af_rose.c --- linux-2.1.21.orig/net/rose/af_rose.c Fri Jan 3 00:13:29 1997 +++ linux/net/rose/af_rose.c Wed Jan 15 14:36:50 1997 @@ -630,7 +630,7 @@ sock_wake_async(sk->socket,1); } } -static void def_callback3(struct sock *sk, int len) +static void def_callback3(struct sock *sk) { if (!sk->dead) { @@ -672,7 +672,7 @@ sk->state_change = def_callback1; sk->data_ready = def_callback2; - sk->write_space = def_callback1; + sk->write_space = def_callback3; sk->error_report = def_callback1; if (sock != NULL) {
|  |