Update to 3.2.0-rc2 headers

diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
index 34542d374dd8609b0e9f893b44ac368d025d7253..14966ddb7df1c5b056578ff622c77cd6400e8094 100644 (file)
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
@@ -5,8 +5,6 @@
  *
  * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com>
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
  */
 
 #ifndef CAN_NETLINK_H

diff --git a/include/linux/if.h b/include/linux/if.h
index ed2c76fbfdc10ede1a230ed42188415d24146791..aec1ddafb82ab16996e0a4619ed331c0bda7ea31 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -78,6 +78,7 @@
                                         * datapath port */
 #define IFF_TX_SKB_SHARING     0x10000 /* The interface supports sharing
                                         * skbs on transmit */
+#define IFF_UNICAST_FLT        0x20000         /* Supports unicast filtering   */
 
 #define IF_GET_IFACE   0x0001          /* for querying only */
 #define IF_GET_PROTO   0x0002

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 19ee3750be2b0fe085cbc451b45ba632fc7e25e5..b4015bf9fec4701da2ed3b11e10c7887e15e1bc7 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -83,11 +83,13 @@
 #define ETH_P_8021AH   0x88E7          /* 802.1ah Backbone Service Tag */
 #define ETH_P_1588     0x88F7          /* IEEE 1588 Timesync */
 #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_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_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_AF_IUCV   0xFBFB         /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
 
 /*
  *     Non DIX types. Won't clash for 1500 types.

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 304c44fdb12e4ad6f96a67ca3b3d2bd90dd2e4ea..d3bc04c3f8ffa2b0bb86d33dabd3324e23a2978a 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -277,6 +277,7 @@ enum {
        IFLA_VF_MAC,            /* Hardware queue specific attributes */
        IFLA_VF_VLAN,
        IFLA_VF_TX_RATE,        /* TX Bandwidth Allocation */
+       IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
        __IFLA_VF_MAX,
 };
 
@@ -298,12 +299,9 @@ struct ifla_vf_tx_rate {
        __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
 };
 
-struct ifla_vf_info {
+struct ifla_vf_spoofchk {
        __u32 vf;
-       __u8 mac[32];
-       __u32 vlan;
-       __u32 qos;
-       __u32 tx_rate;
+       __u32 setting;
 };
 
 /* VF ports management section

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 1107ed2b9a7e2e381cf339479894cfb306cb0eea..de6f1fcc93552075ab09a566f8794c770def2053 100644 (file)
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -97,9 +97,11 @@ enum {
        INET_DIAG_INFO,
        INET_DIAG_VEGASINFO,
        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 */

diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index acb9ad684d639167c6a2c1469e14eb1d6694e93b..bf22b03179022da13565642026213601e879fa88 100644 (file)
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -16,6 +16,8 @@
 #define IP6_TNL_F_MIP6_DEV 0x8
 /* copy DSCP from the outer packet */
 #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 {
        char name[IFNAMSIZ];    /* name of tunnel device */

diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 4d7ba3e4b88f8822933b621edac2313255073e6e..549030940015fdee4e569407da9276c986c8480c 100644 (file)
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -8,6 +8,9 @@
 #include <linux/netfilter.h>
 
 /* only for userspace compatibility */
+
+#include <limits.h> /* for INT_MIN, INT_MAX */
+
 /* IP Cache bits. */
 /* Src IP address. */
 #define NFC_IP_SRC             0x0001

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

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 86afe2b32565dffcc9f08182bfbee15a543515d4..cb257fc45d0bb763cb477ec516cf8d7777f7caa3 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -1,7 +1,7 @@
 #ifndef __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>
 
 #define NETLINK_ROUTE          0       /* Routing/device hook                          */
@@ -25,6 +25,7 @@
 #define NETLINK_SCSITRANSPORT  18      /* SCSI Transports */
 #define NETLINK_ECRYPTFS       19
 #define NETLINK_RDMA           20
+#define NETLINK_CRYPTO         21      /* Crypto layer */
 
 #define MAX_LINKS 32