Update kernel headers to net-next for 3.12

diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 51da65b68b8501cb2d25fe0064c2c6ff65e3d4e6..2b82d7e30974f93b9a93afc2fdf5c9137492043d 100644 (file)
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -44,8 +44,8 @@ enum {
        FRA_FWMARK,     /* mark */
        FRA_FLOW,       /* flow/class id */
        FRA_UNUSED6,
-       FRA_UNUSED7,
-       FRA_UNUSED8,
+       FRA_SUPPRESS_IFGROUP,
+       FRA_SUPPRESS_PREFIXLEN,
        FRA_TABLE,      /* Extended table id */
        FRA_FWMASK,     /* mask for netfilter mark */
        FRA_OIFNAME,

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index d37e53c370546a6ff1ea7cbd4d2dd794c0deb6f1..d2de4e67ff9f67cabaafd0659c785045db927e93 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -14,6 +14,7 @@
 #define _LINUX_IF_BRIDGE_H
 
 #include <linux/types.h>
+#include <linux/if_ether.h>
 
 #define SYSFS_BRIDGE_ATTR      "bridge"
 #define SYSFS_BRIDGE_FDB       "brforward"
@@ -88,7 +89,7 @@ struct __port_info {
 };
 
 struct __fdb_entry {
-       __u8 mac_addr[6];
+       __u8 mac_addr[ETH_ALEN];
        __u8 port_no;
        __u8 is_local;
        __u32 ageing_timer_value;

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index d07aecaaf86921915c22ffa7919411974f49cd30..f80fcea6a5835ca24b33aea3fe4a23b06670c8e4 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -143,6 +143,7 @@ enum {
        IFLA_NUM_TX_QUEUES,
        IFLA_NUM_RX_QUEUES,
        IFLA_CARRIER,
+       IFLA_PHYS_PORT_ID,
        __IFLA_MAX
 };
 

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index dc13de35d88d4f5884a7e281fb10117f997f13a1..6a7fb11d56fa506b78cc28c8d6a5a495ae4a5628 100644 (file)
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -71,6 +71,9 @@
 /* read-only flag */
 #define IFF_PERSIST    0x0800
 
+/* Socket options */
+#define TUN_TX_TIMESTAMP 1
+
 /* Features for GSO (TUNSETOFFLOAD). */
 #define TUN_F_CSUM     0x01    /* You can hand me unchecksummed packets. */
 #define TUN_F_TSO4     0x02    /* I can handle TSO for IPv4 packets */

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 1eb04d354d6fd3f0e8cbfc867cb9e4d1b0379ca1..8df6bd7f4555092d896e952be7cbd62f21cda9b3 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -111,6 +111,7 @@ enum {
 #define TCP_REPAIR_OPTIONS     22
 #define TCP_FASTOPEN           23      /* Enable FastOpen on listeners */
 #define TCP_TIMESTAMP          24
+#define TCP_NOTSENT_LOWAT      25      /* limit number of unsent bytes in write queue */
 
 struct tcp_repair_opt {
        __u32   opt_code;