GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Browse source 
This merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling
of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.
This commit is contained in:
Pablo Neira Ayuso 2012-09-03 15:28:30 +02:00
commit ace1fe1231
368 changed files with 6766 additions and 3350 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/net/netns/ipv4.h
View file

@ -5,6 +5,7 @@
#ifndef __NETNS_IPV4_H__
#define __NETNS_IPV4_H__
#include <linux/uidgid.h>
#include <net/inet_frag.h>
struct tcpm_hash_bucket;
@ -60,7 +61,7 @@ struct netns_ipv4 {
int sysctl_icmp_ratemask;
int sysctl_icmp_errors_use_inbound_ifaddr;
unsigned int sysctl_ping_group_range[2];
kgid_t sysctl_ping_group_range[2];
long sysctl_tcp_mem[3];
atomic_t rt_genid;

2
include/net/netns/packet.h
View file

@ -5,7 +5,7 @@
#define __NETNS_PACKET_H__
#include <linux/rculist.h>
#include <linux/spinlock.h>
#include <linux/mutex.h>
struct netns_packet {
struct mutex sklist_lock;