proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-19 15:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge header file changes from net-2.6.25

Browse Source 
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
This commit is contained in:
Stephen Hemminger 2007-12-10 09:36:07 -08:00
parent 5472ac6f9f
commit 70e6e38aad
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/if.h
View File

@ -49,7 +49,9 @@
#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */ #define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
#define IFF_DORMANT 0x20000 /* driver signals dormant */ #define IFF_DORMANT 0x20000 /* driver signals dormant */
#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|\ #define IFF_ECHO 0x40000 /* echo sent packets */
#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
/* Private (from user) interface flags (netdevice->priv_flags). */ /* Private (from user) interface flags (netdevice->priv_flags). */
@ -60,6 +62,7 @@
#define IFF_MASTER_ALB 0x10 /* bonding master, balance-alb. */ #define IFF_MASTER_ALB 0x10 /* bonding master, balance-alb. */
#define IFF_BONDING 0x20 /* bonding master or slave */ #define IFF_BONDING 0x20 /* bonding master or slave */
#define IFF_SLAVE_NEEDARP 0x40 /* need ARPs for validation */ #define IFF_SLAVE_NEEDARP 0x40 /* need ARPs for validation */
#define IFF_ISATAP 0x80 /* ISATAP interface (RFC4214) */
#define IF_GET_IFACE 0x0001 /* for querying only */ #define IF_GET_IFACE 0x0001 /* for querying only */
#define IF_GET_PROTO 0x0002 #define IF_GET_PROTO 0x0002

8
include/linux/netfilter_ipv4/ip_tables.h
View File

@ -148,10 +148,10 @@ struct ipt_getinfo
unsigned int valid_hooks; unsigned int valid_hooks;
/* Hook entry points: one per netfilter hook. */ /* Hook entry points: one per netfilter hook. */
unsigned int hook_entry[NF_IP_NUMHOOKS]; unsigned int hook_entry[NF_INET_NUMHOOKS];
/* Underflow points. */ /* Underflow points. */
unsigned int underflow[NF_IP_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS];
/* Number of entries */ /* Number of entries */
unsigned int num_entries; unsigned int num_entries;
@ -177,10 +177,10 @@ struct ipt_replace
unsigned int size; unsigned int size;
/* Hook entry points. */ /* Hook entry points. */
unsigned int hook_entry[NF_IP_NUMHOOKS]; unsigned int hook_entry[NF_INET_NUMHOOKS];
/* Underflow points. */ /* Underflow points. */
unsigned int underflow[NF_IP_NUMHOOKS]; unsigned int underflow[NF_INET_NUMHOOKS];
/* Information about old entries: */ /* Information about old entries: */
/* Number of counters (must be equal to current number of entries). */ /* Number of counters (must be equal to current number of entries). */

7
include/linux/rtnetlink.h
View File

@ -100,6 +100,13 @@ enum {
RTM_NEWNDUSEROPT = 68, RTM_NEWNDUSEROPT = 68,
#define RTM_NEWNDUSEROPT RTM_NEWNDUSEROPT #define RTM_NEWNDUSEROPT RTM_NEWNDUSEROPT
RTM_NEWADDRLABEL = 72,
#define RTM_NEWADDRLABEL RTM_NEWADDRLABEL
RTM_DELADDRLABEL,
#define RTM_NEWADDRLABEL RTM_NEWADDRLABEL
RTM_GETADDRLABEL,
#define RTM_GETADDRLABEL RTM_GETADDRLABEL
__RTM_MAX, __RTM_MAX,
#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1)
}; };

3
include/linux/socket.h
View File

@ -23,7 +23,6 @@ struct __kernel_sockaddr_storage {
#include <linux/uio.h> /* iovec support */ #include <linux/uio.h> /* iovec support */
#include <linux/types.h> /* pid_t */ #include <linux/types.h> /* pid_t */
extern int sysctl_somaxconn;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
struct seq_file; struct seq_file;
extern void socket_seq_show(struct seq_file *seq); extern void socket_seq_show(struct seq_file *seq);
@ -182,6 +181,7 @@ struct ucred {
#define AF_PPPOX 24 /* PPPoX sockets */ #define AF_PPPOX 24 /* PPPoX sockets */
#define AF_WANPIPE 25 /* Wanpipe API Sockets */ #define AF_WANPIPE 25 /* Wanpipe API Sockets */
#define AF_LLC 26 /* Linux LLC */ #define AF_LLC 26 /* Linux LLC */
#define AF_CAN 29 /* Controller Area Network */
#define AF_TIPC 30 /* TIPC sockets */ #define AF_TIPC 30 /* TIPC sockets */
#define AF_BLUETOOTH 31 /* Bluetooth sockets */ #define AF_BLUETOOTH 31 /* Bluetooth sockets */
#define AF_IUCV 32 /* IUCV sockets */ #define AF_IUCV 32 /* IUCV sockets */
@ -217,6 +217,7 @@ struct ucred {
#define PF_PPPOX AF_PPPOX #define PF_PPPOX AF_PPPOX
#define PF_WANPIPE AF_WANPIPE #define PF_WANPIPE AF_WANPIPE
#define PF_LLC AF_LLC #define PF_LLC AF_LLC
#define PF_CAN AF_CAN
#define PF_TIPC AF_TIPC #define PF_TIPC AF_TIPC
#define PF_BLUETOOTH AF_BLUETOOTH #define PF_BLUETOOTH AF_BLUETOOTH
#define PF_IUCV AF_IUCV #define PF_IUCV AF_IUCV