Update kernel headers to 2.6.36-rc2

diff --git a/include/linux/if.h b/include/linux/if.h
index a272e379ec2248a975e8b847ac4b861f7226694f..352e2250aee294f31d2c6202289be25e878d10f0 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -73,6 +73,8 @@
 #define IFF_DONT_BRIDGE 0x800          /* disallow bridging this ether dev */
 #define IFF_IN_NETPOLL 0x1000          /* whether we are processing netpoll */
 #define IFF_DISABLE_NETPOLL    0x2000  /* disable netpoll at run-time */
+#define IFF_MACVLAN_PORT       0x4000  /* device used as macvlan port */
+#define IFF_BRIDGE_PORT        0x8000          /* device used as bridge port */
 
 #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 7e275c44603755a018dda019c747776bca47dbf4..5d07e969e07b5001d3868fb7ae81d8ca849e94b7 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -119,7 +119,7 @@ struct ethhdr {
        unsigned char   h_dest[ETH_ALEN];       /* destination eth addr */
        unsigned char   h_source[ETH_ALEN];     /* source ether addr    */
        __be16          h_proto;                /* packet type ID field */
-} __attribute__((packed));
+} __packed;
 
 
 #endif /* _LINUX_IF_ETHER_H */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 01bcaa67b1c0fa8035587c8cacd86e0573e48607..f5bb2dc3e2f6390bf26d83ec3533d79d811d819f 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -4,7 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 
-/* The struct should be in sync with struct net_device_stats */
+/* This struct should be in sync with struct rtnl_link_stats64 */
 struct rtnl_link_stats {
        __u32   rx_packets;             /* total packets received       */
        __u32   tx_packets;             /* total packets transmitted    */
@@ -37,6 +37,7 @@ struct rtnl_link_stats {
        __u32   tx_compressed;
 };
 
+/* The main device statistics structure */
 struct rtnl_link_stats64 {
        __u64   rx_packets;             /* total packets received       */
        __u64   tx_packets;             /* total packets transmitted    */
@@ -231,7 +232,7 @@ enum macvlan_mode {
        MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
 };
 
-/* SR-IOV virtual function managment section */
+/* SR-IOV virtual function management section */
 
 enum {
        IFLA_VF_INFO_UNSPEC,

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3dbf0cc42202ee974952f3f38afb451a12c9ce6c..77c288a780c146828d90fbe9259d09d48c82f1fc 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -35,43 +35,36 @@
 
 
 /*
- *     Network device statistics. Akin to the 2.0 ether stats but
- *     with byte counters.
+ *     Old network device statistics. Fields are native words
+ *     (unsigned long) so they can be read and written atomically.
  */
 
 struct net_device_stats {
-       unsigned long   rx_packets;             /* total packets received       */
-       unsigned long   tx_packets;             /* total packets transmitted    */
-       unsigned long   rx_bytes;               /* total bytes received         */
-       unsigned long   tx_bytes;               /* total bytes transmitted      */
-       unsigned long   rx_errors;              /* bad packets received         */
-       unsigned long   tx_errors;              /* packet transmit problems     */
-       unsigned long   rx_dropped;             /* no space in linux buffers    */
-       unsigned long   tx_dropped;             /* no space available in linux  */
-       unsigned long   multicast;              /* multicast packets received   */
+       unsigned long   rx_packets;
+       unsigned long   tx_packets;
+       unsigned long   rx_bytes;
+       unsigned long   tx_bytes;
+       unsigned long   rx_errors;
+       unsigned long   tx_errors;
+       unsigned long   rx_dropped;
+       unsigned long   tx_dropped;
+       unsigned long   multicast;
        unsigned long   collisions;
-
-       /* detailed rx_errors: */
        unsigned long   rx_length_errors;
-       unsigned long   rx_over_errors;         /* receiver ring buff overflow  */
-       unsigned long   rx_crc_errors;          /* recved pkt with crc error    */
-       unsigned long   rx_frame_errors;        /* recv'd frame alignment error */
-       unsigned long   rx_fifo_errors;         /* recv'r fifo overrun          */
-       unsigned long   rx_missed_errors;       /* receiver missed packet       */
-
-       /* detailed tx_errors */
+       unsigned long   rx_over_errors;
+       unsigned long   rx_crc_errors;
+       unsigned long   rx_frame_errors;
+       unsigned long   rx_fifo_errors;
+       unsigned long   rx_missed_errors;
        unsigned long   tx_aborted_errors;
        unsigned long   tx_carrier_errors;
        unsigned long   tx_fifo_errors;
        unsigned long   tx_heartbeat_errors;
        unsigned long   tx_window_errors;
-       
-       /* for cslip etc */
        unsigned long   rx_compressed;
        unsigned long   tx_compressed;
 };
 
-
 /* Media selection options. */
 enum {
         IF_PORT_UNKNOWN = 0,

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 0d8ef9eca25d638c7618d8900c280b3a346709ab..a3ccbe43ab314493c529d596e005a1147e6dd1ed 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -282,6 +282,7 @@ enum rtattr_type_t {
        RTA_SESSION, /* no longer used */
        RTA_MP_ALGO, /* no longer used */
        RTA_TABLE,
+       RTA_MARK,
        __RTA_MAX
 };