diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /net/ipv4 | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/af_inet.c | 7 | ||||
| -rw-r--r-- | net/ipv4/igmp.c | 11 | ||||
| -rw-r--r-- | net/ipv4/ipconfig.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index b7512a1c9..b848151a9 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -5,7 +5,7 @@ * * PF_INET protocol family socket handler. * - * Version: $Id: af_inet.c,v 1.107 2000/02/18 16:47:20 davem Exp $ + * Version: $Id: af_inet.c,v 1.108 2000/02/21 16:25:59 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -135,7 +135,9 @@ extern int dlci_ioctl(unsigned int, void*); int (*dlci_ioctl_hook)(unsigned int, void *) = NULL; #endif +#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) int (*br_ioctl_hook)(unsigned long) = NULL; +#endif /* New destruction routine */ @@ -837,13 +839,14 @@ static int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) return(devinet_ioctl(cmd,(void *) arg)); case SIOCGIFBR: case SIOCSIFBR: +#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #ifdef CONFIG_KMOD if (br_ioctl_hook == NULL) request_module("bridge"); #endif if (br_ioctl_hook != NULL) return br_ioctl_hook(arg); - +#endif return -ENOPKG; case SIOCADDDLCI: diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 3aad90680..c93da55f9 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -8,7 +8,7 @@ * the older version didn't come out right using gcc 2.5.8, the newer one * seems to fall out with gcc 2.6.2. * - * Version: $Id: igmp.c,v 1.37 2000/02/09 11:16:40 davem Exp $ + * Version: $Id: igmp.c,v 1.38 2000/02/27 01:20:02 davem Exp $ * * Authors: * Alan Cox <Alan.Cox@linux.org> @@ -93,6 +93,7 @@ #include <net/route.h> #include <net/sock.h> #include <net/checksum.h> +#include <linux/netfilter_ipv4.h> #ifdef CONFIG_IP_MROUTE #include <linux/mroute.h> #endif @@ -185,6 +186,11 @@ static void igmp_mod_timer(struct ip_mc_list *im, int max_delay) #define IGMP_SIZE (sizeof(struct igmphdr)+sizeof(struct iphdr)+4) +static inline int igmp_send_report2(struct sk_buff *skb) +{ + return skb->dst->output(skb); +} + static int igmp_send_report(struct net_device *dev, u32 group, int type) { struct sk_buff *skb; @@ -242,7 +248,8 @@ static int igmp_send_report(struct net_device *dev, u32 group, int type) ih->group=group; ih->csum=ip_compute_csum((void *)ih, sizeof(struct igmphdr)); - return skb->dst->output(skb); + return NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, + igmp_send_report2); } diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index bcdd71354..454e81fea 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1,5 +1,5 @@ /* - * $Id: ipconfig.c,v 1.26 2000/01/29 07:42:08 davem Exp $ + * $Id: ipconfig.c,v 1.27 2000/02/21 15:51:41 davem Exp $ * * Automatic Configuration of IP -- use BOOTP or RARP or user-supplied * information to configure own IP address and routes. diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 37ab925bf..887aaa519 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -5,7 +5,7 @@ * * Implementation of the Transmission Control Protocol(TCP). * - * Version: $Id: tcp_output.c,v 1.121 2000/02/08 21:27:19 davem Exp $ + * Version: $Id: tcp_output.c,v 1.122 2000/02/21 15:51:41 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> |