matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to 3.2.0-rc2 headers

This commit is contained in:
Stephen Hemminger 2011-11-23 14:34:49 -08:00
parent 9cbe6bc337
commit 9044a4547d
9 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/can/netlink.h
View File

@ -5,8 +5,6 @@
* *
* Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com> * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com>
* *
* Send feedback to <socketcan-users@lists.berlios.de>
*
*/ */
#ifndef CAN_NETLINK_H #ifndef CAN_NETLINK_H

1
include/linux/if.h
View File

@ -78,6 +78,7 @@
* datapath port */ * datapath port */
#define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing #define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing
* skbs on transmit */ * skbs on transmit */
#define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */
#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

2
include/linux/if_ether.h
View File

@ -83,11 +83,13 @@
#define ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */ #define ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */
#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ #define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */
#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ #define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
#define ETH_P_TDLS 0x890D /* TDLS */
#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ #define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
#define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
#define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
#define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
#define ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
/* /*
* Non DIX types. Won't clash for 1500 types. * Non DIX types. Won't clash for 1500 types.

8
include/linux/if_link.h
View File

@ -277,6 +277,7 @@ enum {
IFLA_VF_MAC, /* Hardware queue specific attributes */ IFLA_VF_MAC, /* Hardware queue specific attributes */
IFLA_VF_VLAN, IFLA_VF_VLAN,
IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
__IFLA_VF_MAX, __IFLA_VF_MAX,
}; };
@ -298,12 +299,9 @@ struct ifla_vf_tx_rate {
__u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */ __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
}; };
struct ifla_vf_info { struct ifla_vf_spoofchk {
__u32 vf; __u32 vf;
__u8 mac[32]; __u32 setting;
__u32 vlan;
__u32 qos;
__u32 tx_rate;
}; };
/* VF ports management section /* VF ports management section

4
include/linux/inet_diag.h
View File

@ -97,9 +97,11 @@ enum {
INET_DIAG_INFO, INET_DIAG_INFO,
INET_DIAG_VEGASINFO, INET_DIAG_VEGASINFO,
INET_DIAG_CONG, INET_DIAG_CONG,
INET_DIAG_TOS,
INET_DIAG_TCLASS,
}; };
#define INET_DIAG_MAX INET_DIAG_CONG #define INET_DIAG_MAX INET_DIAG_TCLASS
/* INET_DIAG_MEM */ /* INET_DIAG_MEM */

2
include/linux/ip6_tunnel.h
View File

@ -16,6 +16,8 @@
#define IP6_TNL_F_MIP6_DEV 0x8 #define IP6_TNL_F_MIP6_DEV 0x8
/* copy DSCP from the outer packet */ /* copy DSCP from the outer packet */
#define IP6_TNL_F_RCV_DSCP_COPY 0x10 #define IP6_TNL_F_RCV_DSCP_COPY 0x10
/* copy fwmark from inner packet */
#define IP6_TNL_F_USE_ORIG_FWMARK 0x20
struct ip6_tnl_parm { struct ip6_tnl_parm {
char name[IFNAMSIZ]; /* name of tunnel device */ char name[IFNAMSIZ]; /* name of tunnel device */

3
include/linux/netfilter_ipv4.h
View File

@ -8,6 +8,9 @@
#include <linux/netfilter.h> #include <linux/netfilter.h>
/* only for userspace compatibility */ /* only for userspace compatibility */
#include <limits.h> /* for INT_MIN, INT_MAX */
/* IP Cache bits. */ /* IP Cache bits. */
/* Src IP address. */ /* Src IP address. */
#define NFC_IP_SRC 0x0001 #define NFC_IP_SRC 0x0001

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

@ -73,12 +73,12 @@ struct ipt_ip {
unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ]; unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
/* Protocol, 0 = ANY */ /* Protocol, 0 = ANY */
u_int16_t proto; __u16 proto;
/* Flags word */ /* Flags word */
u_int8_t flags; __u8 flags;
/* Inverse flags */ /* Inverse flags */
u_int8_t invflags; __u8 invflags;
}; };
/* Values for "flag" field in struct ipt_ip (general ip structure). */ /* Values for "flag" field in struct ipt_ip (general ip structure). */
@ -106,9 +106,9 @@ struct ipt_entry {
unsigned int nfcache; unsigned int nfcache;
/* Size of ipt_entry + matches */ /* Size of ipt_entry + matches */
u_int16_t target_offset; __u16 target_offset;
/* Size of ipt_entry + matches + target */ /* Size of ipt_entry + matches + target */
u_int16_t next_offset; __u16 next_offset;
/* Back pointer */ /* Back pointer */
unsigned int comefrom; unsigned int comefrom;
@ -141,9 +141,9 @@ struct ipt_entry {
/* ICMP matching stuff */ /* ICMP matching stuff */
struct ipt_icmp { struct ipt_icmp {
u_int8_t type; /* type to match */ __u8 type; /* type to match */
u_int8_t code[2]; /* range of code */ __u8 code[2]; /* range of code */
u_int8_t invflags; /* Inverse flags */ __u8 invflags; /* Inverse flags */
}; };
/* Values for "inv" field for struct ipt_icmp. */ /* Values for "inv" field for struct ipt_icmp. */

3
include/linux/netlink.h
View File

@ -1,7 +1,7 @@
#ifndef __LINUX_NETLINK_H #ifndef __LINUX_NETLINK_H
#define __LINUX_NETLINK_H #define __LINUX_NETLINK_H
#include <linux/socket.h> /* for sa_family_t */ #include <linux/socket.h> /* for __kernel_sa_family_t */
#include <linux/types.h> #include <linux/types.h>
#define NETLINK_ROUTE 0 /* Routing/device hook */ #define NETLINK_ROUTE 0 /* Routing/device hook */
@ -25,6 +25,7 @@
#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */ #define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */
#define NETLINK_ECRYPTFS 19 #define NETLINK_ECRYPTFS 19
#define NETLINK_RDMA 20 #define NETLINK_RDMA 20
#define NETLINK_CRYPTO 21 /* Crypto layer */
#define MAX_LINKS 32 #define MAX_LINKS 32