From a60c6812feb6ba35b5b8a9ee8a5ca3d01d1fcd5f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 29 Aug 2000 05:27:07 +0000 Subject: Merge with Linux 2.4.0-test8-pre1. --- net/ipv4/ip_gre.c | 6 ++++++ net/ipv4/ip_output.c | 3 ++- net/ipv4/ipip.c | 8 +++++++- net/ipv6/sit.c | 8 +++++++- net/packet/af_packet.c | 4 ++-- net/socket.c | 5 ++--- 6 files changed, 26 insertions(+), 8 deletions(-) (limited to 'net') diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index c2a3ea271..e7167aa65 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -632,6 +632,9 @@ int ipgre_rcv(struct sk_buff *skb, unsigned short len) #ifdef CONFIG_NETFILTER nf_conntrack_put(skb->nfct); skb->nfct = NULL; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; +#endif #endif ipgre_ecn_decapsulate(iph, skb); netif_rx(skb); @@ -858,6 +861,9 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) #ifdef CONFIG_NETFILTER nf_conntrack_put(skb->nfct); skb->nfct = NULL; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; +#endif #endif IPTUNNEL_XMIT(); diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 5792c5de7..3d0e2b4aa 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -5,7 +5,7 @@ * * The Internet Protocol (IP) output module. * - * Version: $Id: ip_output.c,v 1.83 2000/03/25 01:52:08 davem Exp $ + * Version: $Id: ip_output.c,v 1.84 2000/08/25 02:15:47 davem Exp $ * * Authors: Ross Biro, * Fred N. van Kempen, @@ -327,6 +327,7 @@ static inline int ip_queue_xmit2(struct sk_buff *skb) kfree_skb(skb); return -EHOSTUNREACH; } + rt = (struct rtable *)skb->dst; } #endif diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 02af22ff9..eae29c0b0 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -1,7 +1,7 @@ /* * Linux NET3: IP/IP protocol decoder. * - * Version: $Id: ipip.c,v 1.38 2000/08/02 06:03:59 davem Exp $ + * Version: $Id: ipip.c,v 1.39 2000/08/25 02:15:47 davem Exp $ * * Authors: * Sam Lantinga (slouken@cs.ucdavis.edu) 02/01/95 @@ -496,6 +496,9 @@ int ipip_rcv(struct sk_buff *skb, unsigned short len) #ifdef CONFIG_NETFILTER nf_conntrack_put(skb->nfct); skb->nfct = NULL; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; +#endif #endif ipip_ecn_decapsulate(iph, skb); netif_rx(skb); @@ -639,6 +642,9 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) #ifdef CONFIG_NETFILTER nf_conntrack_put(skb->nfct); skb->nfct = NULL; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; +#endif #endif IPTUNNEL_XMIT(); diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index b77f8789d..59048a22b 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -6,7 +6,7 @@ * Pedro Roque * Alexey Kuznetsov * - * $Id: sit.c,v 1.42 2000/08/02 06:03:59 davem Exp $ + * $Id: sit.c,v 1.43 2000/08/25 02:15:47 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -401,6 +401,9 @@ int ipip6_rcv(struct sk_buff *skb, unsigned short len) #ifdef CONFIG_NETFILTER nf_conntrack_put(skb->nfct); skb->nfct = NULL; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; +#endif #endif ipip6_ecn_decapsulate(iph, skb); netif_rx(skb); @@ -567,6 +570,9 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) #ifdef CONFIG_NETFILTER nf_conntrack_put(skb->nfct); skb->nfct = NULL; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; +#endif #endif IPTUNNEL_XMIT(); diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 617519846..990431eb8 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1585,7 +1585,7 @@ static void free_pg_vec(unsigned long *pg_vec, unsigned order, unsigned len) pend = virt_to_page(pg_vec[i] + (PAGE_SIZE << order) - 1); for (page = virt_to_page(pg_vec[i]); page <= pend; page++) - clear_bit(PG_reserved, &page->flags); + ClearPageReserved(page); free_pages(pg_vec[i], order); } } @@ -1640,7 +1640,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing pend = virt_to_page(pg_vec[i] + (PAGE_SIZE << order) - 1); for (page = virt_to_page(pg_vec[i]); page <= pend; page++) - set_bit(PG_reserved, &page->flags); + SetPageReserved(page); } /* Page vector is allocated */ diff --git a/net/socket.c b/net/socket.c index 015630d2e..5691718c9 100644 --- a/net/socket.c +++ b/net/socket.c @@ -855,7 +855,7 @@ int sock_create(int family, int type, int protocol, struct socket **res) net_family_read_lock(); if (net_families[family] == NULL) { - i = -EINVAL; + i = -EAFNOSUPPORT; goto out; } @@ -1710,10 +1710,9 @@ void __init sock_init(void) * Initialize the protocols module. */ - proto_init(); - register_filesystem(&sock_fs_type); sock_mnt = kern_mount(&sock_fs_type); + proto_init(); /* * The netlink device handler may be needed early. -- cgit v1.2.3