217 files changed, 3541 insertions, 1739 deletions
diff --git a/include/asm-generic/socket.h b/include/asm-generic/socket.h
index 538991cef6f0..9a6115e7cf63 100644
--- a/include/asm-generic/socket.h
+++ b/include/asm-generic/socket.h
@@ -63,4 +63,5 @@
 #define SO_PROTOCOL             38
 #define SO_DOMAIN               39
+#define SO_RXQ_OVFL             40
 #endif /* __ASM_GENERIC_SOCKET_H */
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 9b64b6d67873..2b31b91f5871 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -1,6 +1,13 @@
-#define PHY_BRCM_WIRESPEED_ENABLE       0x00000001
+#define PHY_BCM_FLAGS_MODE_COPPER       0x00000001
-#define PHY_BRCM_AUTO_PWRDWN_ENABLE     0x00000002
+#define PHY_BCM_FLAGS_MODE_1000BX       0x00000002
-#define PHY_BRCM_APD_CLK125_ENABLE      0x00000004
+#define PHY_BCM_FLAGS_INTF_SGMII        0x00000010
-#define PHY_BRCM_STD_IBND_DISABLE       0x00000008
+#define PHY_BCM_FLAGS_INTF_XAUI         0x00000020
-#define PHY_BRCM_EXT_IBND_RX_ENABLE     0x00000010
+#define PHY_BRCM_WIRESPEED_ENABLE       0x00000100
-#define PHY_BRCM_EXT_IBND_TX_ENABLE     0x00000020
+#define PHY_BRCM_AUTO_PWRDWN_ENABLE     0x00000200
+#define PHY_BRCM_RX_REFCLK_UNUSED       0x00000400
+#define PHY_BRCM_STD_IBND_DISABLE       0x00000800
+#define PHY_BRCM_EXT_IBND_RX_ENABLE     0x00001000
+#define PHY_BRCM_EXT_IBND_TX_ENABLE     0x00002000
+#define PHY_BRCM_CLEAR_RGMII_MODE       0x00004000
+#define PHY_BRCM_DIS_TXCRXC_NOENRGY     0x00008000
+#define PHY_BCM_FLAGS_VALID             0x80000000
diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index 25085cbadcfc..6c507bea275f 100644
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -32,14 +32,12 @@
 * struct can_proto - CAN protocol structure
 * @type:       type argument in socket() syscall, e.g. SOCK_DGRAM.
 * @protocol:   protocol number in socket() syscall.
- * @capability: capability needed to open the socket, or -1 for no restriction.
 * @ops:        pointer to struct proto_ops for sock->ops.
 * @prot:       pointer to struct proto structure.
 */
 struct can_proto {
        int              type;
        int              protocol;
-        int              capability;
        struct proto_ops *ops;
        struct proto     *prot;
 };
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 5824b20b5fcb..1ed2a5cc03f5 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -29,8 +29,6 @@ enum can_mode {
 /*
 * CAN common private data
 */
-#define CAN_ECHO_SKB_MAX  4
 struct can_priv {
        struct can_device_stats can_stats;
@@ -44,15 +42,16 @@ struct can_priv {
        int restart_ms;
        struct timer_list restart_timer;
-        struct sk_buff *echo_skb[CAN_ECHO_SKB_MAX];
        int (*do_set_bittiming)(struct net_device *dev);
        int (*do_set_mode)(struct net_device *dev, enum can_mode mode);
        int (*do_get_state)(const struct net_device *dev,
                            enum can_state *state);
+        unsigned int echo_skb_max;
+        struct sk_buff **echo_skb;
 };
-struct net_device *alloc_candev(int sizeof_priv);
+struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
 void free_candev(struct net_device *dev);
 int open_candev(struct net_device *dev);
@@ -64,8 +63,13 @@ void unregister_candev(struct net_device *dev);
 int can_restart_now(struct net_device *dev);
 void can_bus_off(struct net_device *dev);
-void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, int idx);
+void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
-void can_get_echo_skb(struct net_device *dev, int idx);
+                      unsigned int idx);
-void can_free_echo_skb(struct net_device *dev, int idx);
+void can_get_echo_skb(struct net_device *dev, unsigned int idx);
+void can_free_echo_skb(struct net_device *dev, unsigned int idx);
+struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
+struct sk_buff *alloc_can_err_skb(struct net_device *dev,
+                                  struct can_frame **cf);
 #endif /* CAN_DEV_H */
diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h
new file mode 100644
index 000000000000..1448177d86d5
--- /dev/null
+++ b/include/linux/can/platform/mcp251x.h
@@ -0,0 +1,36 @@
+#ifndef __CAN_PLATFORM_MCP251X_H__
+#define __CAN_PLATFORM_MCP251X_H__
+/*
+ *
+ * CAN bus driver for Microchip 251x CAN Controller with SPI Interface
+ *
+ */
+#include <linux/spi/spi.h>
+/**
+ * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data
+ * @oscillator_frequency:       - oscillator frequency in Hz
+ * @model:                      - actual type of chip
+ * @board_specific_setup:       - called before probing the chip (power,reset)
+ * @transceiver_enable:         - called to power on/off the transceiver
+ * @power_enable:               - called to power on/off the mcp *and* the
+ *                                transceiver
+ *
+ * Please note that you should define power_enable or transceiver_enable or
+ * none of them. Defining both of them is no use.
+ *
+ */
+struct mcp251x_platform_data {
+        unsigned long oscillator_frequency;
+        int model;
+#define CAN_MCP251X_MCP2510 0
+#define CAN_MCP251X_MCP2515 1
+        int (*board_specific_setup)(struct spi_device *spi);
+        int (*transceiver_enable)(int enable);
+        int (*power_enable) (int enable);
+};
+#endif /* __CAN_PLATFORM_MCP251X_H__ */
diff --git a/include/linux/can/platform/ti_hecc.h b/include/linux/can/platform/ti_hecc.h
new file mode 100644
index 000000000000..4688c7bb1bd1
--- /dev/null
+++ b/include/linux/can/platform/ti_hecc.h
@@ -0,0 +1,40 @@
+/*
+ * TI HECC (High End CAN Controller) driver platform header
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed as is WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+/**
+ * struct hecc_platform_data - HECC Platform Data
+ *
+ * @scc_hecc_offset:    mostly 0 - should really never change
+ * @scc_ram_offset:     SCC RAM offset
+ * @hecc_ram_offset:    HECC RAM offset
+ * @mbx_offset:         Mailbox RAM offset
+ * @int_line:           Interrupt line to use - 0 or 1
+ * @version:            version for future use
+ *
+ * Platform data structure to get all platform specific settings.
+ * this structure also accounts the fact that the IP may have different
+ * RAM and mailbox offsets for different SOC's
+ */
+struct ti_hecc_platform_data {
+        u32 scc_hecc_offset;
+        u32 scc_ram_offset;
+        u32 hecc_ram_offset;
+        u32 mbx_offset;
+        u32 int_line;
+        u32 version;
+};
diff --git a/include/linux/compat.h b/include/linux/compat.h
index af931ee43dd8..ef68119a4fd2 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -10,6 +10,8 @@
 #include <linux/stat.h>
 #include <linux/param.h>        /* for HZ */
 #include <linux/sem.h>
+#include <linux/socket.h>
+#include <linux/if.h>
 #include <asm/compat.h>
 #include <asm/siginfo.h>
@@ -154,6 +156,48 @@ typedef struct compat_sigevent {
        } _sigev_un;
 } compat_sigevent_t;
+struct compat_ifmap {
+        compat_ulong_t mem_start;
+        compat_ulong_t mem_end;
+        unsigned short base_addr;
+        unsigned char irq;
+        unsigned char dma;
+        unsigned char port;
+};
+struct compat_if_settings
+{
+        unsigned int type;      /* Type of physical device or protocol */
+        unsigned int size;      /* Size of the data allocated by the caller */
+        compat_uptr_t ifs_ifsu; /* union of pointers */
+};
+struct compat_ifreq {
+        union {
+                char    ifrn_name[IFNAMSIZ];    /* if name, e.g. "en0" */
+        } ifr_ifrn;
+        union {
+                struct  sockaddr ifru_addr;
+                struct  sockaddr ifru_dstaddr;
+                struct  sockaddr ifru_broadaddr;
+                struct  sockaddr ifru_netmask;
+                struct  sockaddr ifru_hwaddr;
+                short   ifru_flags;
+                compat_int_t    ifru_ivalue;
+                compat_int_t    ifru_mtu;
+                struct  compat_ifmap ifru_map;
+                char    ifru_slave[IFNAMSIZ];   /* Just fits the size */
+                char    ifru_newname[IFNAMSIZ];
+                compat_caddr_t  ifru_data;
+                struct  compat_if_settings ifru_settings;
+        } ifr_ifru;
+};
+struct compat_ifconf {
+        compat_int_t    ifc_len;                        /* size of buffer       */
+        compat_caddr_t  ifcbuf;
+};
 struct compat_robust_list {
        compat_uptr_t                   next;
 };
diff --git a/include/linux/cryptohash.h b/include/linux/cryptohash.h
index c118b2ad9807..ec78a4bbe1d5 100644
--- a/include/linux/cryptohash.h
+++ b/include/linux/cryptohash.h
@@ -2,6 +2,7 @@
 #define __CRYPTOHASH_H
 #define SHA_DIGEST_WORDS 5
+#define SHA_MESSAGE_BYTES (512 /*bits*/ / 8)
 #define SHA_WORKSPACE_WORDS 80
 void sha_init(__u32 *buf);
diff --git a/include/linux/dn.h b/include/linux/dn.h
index fe9990823193..9c50445462d9 100644
--- a/include/linux/dn.h
+++ b/include/linux/dn.h
@@ -71,14 +71,12 @@
 /* Structures */
-struct dn_naddr 
+struct dn_naddr {
-{
        __le16          a_len;
        __u8 a_addr[DN_MAXADDL]; /* Two bytes little endian */
 };
-struct sockaddr_dn
+struct sockaddr_dn {
-{
        __u16           sdn_family;
        __u8            sdn_flags;
        __u8            sdn_objnum;
@@ -101,8 +99,7 @@ struct optdata_dn {
        __u8   opt_data[16];   /* User data              */
 };
-struct accessdata_dn
+struct accessdata_dn {
-{
        __u8            acc_accl;
        __u8            acc_acc[DN_MAXACCL];
        __u8            acc_passl;
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index ec12cc74366f..034072cea853 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -3,8 +3,7 @@
 #include <linux/types.h>
-struct sock_extended_err
+struct sock_extended_err {
-{
        __u32   ee_errno;       
        __u8    ee_origin;
        __u8    ee_type;
@@ -31,8 +30,7 @@ struct sock_extended_err
 #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb))
-struct sock_exterr_skb
+struct sock_exterr_skb {
-{
        union {
                struct inet_skb_parm    h4;
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 15e4eb713694..ef4a2d84d922 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -49,13 +49,14 @@ static inline __u32 ethtool_cmd_speed(struct ethtool_cmd *ep)
        return (ep->speed_hi << 16) | ep->speed;
 }
+#define ETHTOOL_FWVERS_LEN      32
 #define ETHTOOL_BUSINFO_LEN     32
 /* these strings are set to whatever the driver author decides... */
 struct ethtool_drvinfo {
        __u32   cmd;
        char    driver[32];     /* driver short name, "tulip", "eepro100" */
        char    version[32];    /* driver version string */
-        char    fw_version[32]; /* firmware version string, if applicable */
+        char    fw_version[ETHTOOL_FWVERS_LEN]; /* firmware version string */
        char    bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
                                /* For PCI devices, use pci_name(pci_dev). */
        char    reserved1[32];
@@ -495,13 +496,10 @@ struct ethtool_ops {
        u32     (*get_priv_flags)(struct net_device *);
        int     (*set_priv_flags)(struct net_device *, u32);
        int     (*get_sset_count)(struct net_device *, int);
-        /* the following hooks are obsolete */
-        int     (*self_test_count)(struct net_device *);/* use get_sset_count */
-        int     (*get_stats_count)(struct net_device *);/* use get_sset_count */
        int     (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, void *);
        int     (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);
        int     (*flash_device)(struct net_device *, struct ethtool_flash *);
+        int     (*reset)(struct net_device *, u32 *);
 };
 #endif /* __KERNEL__ */
@@ -559,6 +557,7 @@ struct ethtool_ops {
 #define ETHTOOL_SRXCLSRLDEL     0x00000031 /* Delete RX classification rule */
 #define ETHTOOL_SRXCLSRLINS     0x00000032 /* Insert RX classification rule */
 #define ETHTOOL_FLASHDEV        0x00000033 /* Flash firmware to device */
+#define ETHTOOL_RESET           0x00000034 /* Reset hardware */
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -633,6 +632,8 @@ struct ethtool_ops {
 #define PORT_MII                0x02
 #define PORT_FIBRE              0x03
 #define PORT_BNC                0x04
+#define PORT_DA                 0x05
+#define PORT_NONE               0xef
 #define PORT_OTHER              0xff
 /* Which transceiver to use. */
@@ -676,6 +677,8 @@ struct ethtool_ops {
 #define AH_V6_FLOW      0x0b
 #define ESP_V6_FLOW     0x0c
 #define IP_USER_FLOW    0x0d
+#define IPV4_FLOW       0x10
+#define IPV6_FLOW       0x11
 /* L3-L4 network traffic flow hash options */
 #define RXH_L2DA        (1 << 1)
@@ -689,4 +692,34 @@ struct ethtool_ops {
 #define RX_CLS_FLOW_DISC        0xffffffffffffffffULL
+/* Reset flags */
+/* The reset() operation must clear the flags for the components which
+ * were actually reset.  On successful return, the flags indicate the
+ * components which were not reset, either because they do not exist
+ * in the hardware or because they cannot be reset independently.  The
+ * driver must never reset any components that were not requested.
+ */
+enum ethtool_reset_flags {
+        /* These flags represent components dedicated to the interface
+         * the command is addressed to.  Shift any flag left by
+         * ETH_RESET_SHARED_SHIFT to reset a shared component of the
+         * same type.
+         */
+        ETH_RESET_MGMT          = 1 << 0,       /* Management processor */
+        ETH_RESET_IRQ           = 1 << 1,       /* Interrupt requester */
+        ETH_RESET_DMA           = 1 << 2,       /* DMA engine */
+        ETH_RESET_FILTER        = 1 << 3,       /* Filtering/flow direction */
+        ETH_RESET_OFFLOAD       = 1 << 4,       /* Protocol offload */
+        ETH_RESET_MAC           = 1 << 5,       /* Media access controller */
+        ETH_RESET_PHY           = 1 << 6,       /* Transceiver/PHY */
+        ETH_RESET_RAM           = 1 << 7,       /* RAM shared between
+                                                 * multiple components */
+        ETH_RESET_DEDICATED     = 0x0000ffff,   /* All components dedicated to
+                                                 * this interface */
+        ETH_RESET_ALL           = 0xffffffff,   /* All components used by this
+                                                 * interface, even if shared */
+};
+#define ETH_RESET_SHARED_SHIFT  16
 #endif /* _LINUX_ETHTOOL_H */
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 87b606b63f1e..51da65b68b85 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -8,13 +8,14 @@
 #define FIB_RULE_PERMANENT      0x00000001
 #define FIB_RULE_INVERT         0x00000002
 #define FIB_RULE_UNRESOLVED     0x00000004
-#define FIB_RULE_DEV_DETACHED   0x00000008
+#define FIB_RULE_IIF_DETACHED   0x00000008
+#define FIB_RULE_DEV_DETACHED   FIB_RULE_IIF_DETACHED
+#define FIB_RULE_OIF_DETACHED   0x00000010
 /* try to find source address in routing lookups */
 #define FIB_RULE_FIND_SADDR     0x00010000
-struct fib_rule_hdr
+struct fib_rule_hdr {
-{
        __u8            family;
        __u8            dst_len;
        __u8            src_len;
@@ -28,12 +29,12 @@ struct fib_rule_hdr
        __u32           flags;
 };
-enum
+enum {
-{
        FRA_UNSPEC,
        FRA_DST,        /* destination address */
        FRA_SRC,        /* source address */
-        FRA_IFNAME,     /* interface name */
+        FRA_IIFNAME,    /* interface name */
+#define FRA_IFNAME      FRA_IIFNAME
        FRA_GOTO,       /* target to jump to (FR_ACT_GOTO) */
        FRA_UNUSED2,
        FRA_PRIORITY,   /* priority/preference */
@@ -47,13 +48,13 @@ enum
        FRA_UNUSED8,
        FRA_TABLE,      /* Extended table id */
        FRA_FWMASK,     /* mask for netfilter mark */
+        FRA_OIFNAME,
        __FRA_MAX
 };
 #define FRA_MAX (__FRA_MAX - 1)
-enum
+enum {
-{
        FR_ACT_UNSPEC,
        FR_ACT_TO_TBL,          /* Pass to fixed table */
        FR_ACT_GOTO,            /* Jump to another rule */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 1354aaf6abbe..29a0e3db9f43 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -23,16 +23,14 @@
 *      the BPF code definitions which need to match so you can share filters
 */
 
-struct sock_filter      /* Filter block */
+struct sock_filter {    /* Filter block */
-{
        __u16   code;   /* Actual filter code */
        __u8    jt;     /* Jump true */
        __u8    jf;     /* Jump false */
        __u32   k;      /* Generic multiuse field */
 };
-struct sock_fprog       /* Required for SO_ATTACH_FILTER. */
+struct sock_fprog {     /* Required for SO_ATTACH_FILTER. */
-{
        unsigned short          len;    /* Number of filter blocks */
        struct sock_filter __user *filter;
 };
@@ -123,7 +121,9 @@ struct sock_fprog	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_IFINDEX  8
 #define SKF_AD_NLATTR   12
 #define SKF_AD_NLATTR_NEST      16
-#define SKF_AD_MAX      20
+#define SKF_AD_MARK     20
+#define SKF_AD_QUEUE    24
+#define SKF_AD_MAX      28
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h
index 710e901085d0..552c8a0a12d1 100644
--- a/include/linux/gen_stats.h
+++ b/include/linux/gen_stats.h
@@ -18,13 +18,11 @@ enum {
 * @bytes: number of seen bytes
 * @packets: number of seen packets
 */
-struct gnet_stats_basic
+struct gnet_stats_basic {
-{
        __u64   bytes;
        __u32   packets;
 };
-struct gnet_stats_basic_packed
+struct gnet_stats_basic_packed {
-{
        __u64   bytes;
        __u32   packets;
 } __attribute__ ((packed));
@@ -34,8 +32,7 @@ struct gnet_stats_basic_packed
 * @bps: current byte rate
 * @pps: current packet rate
 */
-struct gnet_stats_rate_est
+struct gnet_stats_rate_est {
-{
        __u32   bps;
        __u32   pps;
 };
@@ -48,8 +45,7 @@ struct gnet_stats_rate_est
 * @requeues: number of requeues
 * @overlimits: number of enqueues over the limit
 */
-struct gnet_stats_queue
+struct gnet_stats_queue {
-{
        __u32   qlen;
        __u32   backlog;
        __u32   drops;
@@ -62,8 +58,7 @@ struct gnet_stats_queue
 * @interval: sampling period
 * @ewma_log: the log of measurement window weight
 */
-struct gnet_estimator
+struct gnet_estimator {
-{
        signed char     interval;
        unsigned char   ewma_log;
 };
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index 508824ee35e6..5306a759cbde 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -401,6 +401,24 @@ struct twl4030_power_data {
 extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
+struct twl4030_codec_audio_data {
+        unsigned int    audio_mclk;
+        unsigned int ramp_delay_value;
+        unsigned int hs_extmute:1;
+        void (*set_hs_extmute)(int mute);
+};
+struct twl4030_codec_vibra_data {
+        unsigned int    audio_mclk;
+        unsigned int    coexist;
+};
+struct twl4030_codec_data {
+        unsigned int    audio_mclk;
+        struct twl4030_codec_audio_data         *audio;
+        struct twl4030_codec_vibra_data         *vibra;
+};
 struct twl4030_platform_data {
        unsigned                                irq_base, irq_end;
        struct twl4030_bci_platform_data        *bci;
@@ -409,6 +427,7 @@ struct twl4030_platform_data {
        struct twl4030_keypad_data              *keypad;
        struct twl4030_usb_data                 *usb;
        struct twl4030_power_data               *power;
+        struct twl4030_codec_data               *codec;
        /* LDO regulators */
        struct regulator_init_data              *vdac;
diff --git a/include/linux/i82593.h b/include/linux/i82593.h
new file mode 100644
index 000000000000..afac5c7a323d
--- /dev/null
+++ b/include/linux/i82593.h
@@ -0,0 +1,229 @@
+/*
+ * Definitions for Intel 82593 CSMA/CD Core LAN Controller
+ * The definitions are taken from the 1992 users manual with Intel
+ * order number 297125-001.
+ *
+ * /usr/src/pc/RCS/i82593.h,v 1.1 1996/07/17 15:23:12 root Exp
+ *
+ * Copyright 1994, Anders Klemets <klemets@it.kth.se>
+ *
+ * HISTORY
+ * i82593.h,v
+ * Revision 1.4  2005/11/4  09:15:00  baroniunas
+ * Modified copyright with permission of author as follows:
+ *
+ *   "If I82539.H is the only file with my copyright statement
+ *    that is included in the Source Forge project, then you have
+ *    my approval to change the copyright statement to be a GPL
+ *    license, in the way you proposed on October 10."
+ *
+ * Revision 1.1  1996/07/17 15:23:12  root
+ * Initial revision
+ *
+ * Revision 1.3  1995/04/05  15:13:58  adj
+ * Initial alpha release
+ *
+ * Revision 1.2  1994/06/16  23:57:31  klemets
+ * Mirrored all the fields in the configuration block.
+ *
+ * Revision 1.1  1994/06/02  20:25:34  klemets
+ * Initial revision
+ *
+ *
+ */
+#ifndef _I82593_H
+#define _I82593_H
+/* Intel 82593 CSMA/CD Core LAN Controller */
+/* Port 0 Command Register definitions */
+/* Execution operations */
+#define OP0_NOP                 0       /* CHNL = 0 */
+#define OP0_SWIT_TO_PORT_1      0       /* CHNL = 1 */
+#define OP0_IA_SETUP            1
+#define OP0_CONFIGURE           2
+#define OP0_MC_SETUP            3
+#define OP0_TRANSMIT            4
+#define OP0_TDR                 5
+#define OP0_DUMP                6
+#define OP0_DIAGNOSE            7
+#define OP0_TRANSMIT_NO_CRC     9
+#define OP0_RETRANSMIT          12
+#define OP0_ABORT               13
+/* Reception operations */
+#define OP0_RCV_ENABLE          8
+#define OP0_RCV_DISABLE         10
+#define OP0_STOP_RCV            11
+/* Status pointer control operations */
+#define OP0_FIX_PTR             15      /* CHNL = 1 */
+#define OP0_RLS_PTR             15      /* CHNL = 0 */
+#define OP0_RESET               14
+#define CR0_CHNL                (1 << 4)        /* 0=Channel 0, 1=Channel 1 */
+#define CR0_STATUS_0            0x00
+#define CR0_STATUS_1            0x20
+#define CR0_STATUS_2            0x40
+#define CR0_STATUS_3            0x60
+#define CR0_INT_ACK             (1 << 7)        /* 0=No ack, 1=acknowledge */
+/* Port 0 Status Register definitions */
+#define SR0_NO_RESULT           0               /* dummy */
+#define SR0_EVENT_MASK          0x0f
+#define SR0_IA_SETUP_DONE       1
+#define SR0_CONFIGURE_DONE      2
+#define SR0_MC_SETUP_DONE       3
+#define SR0_TRANSMIT_DONE       4
+#define SR0_TDR_DONE            5
+#define SR0_DUMP_DONE           6
+#define SR0_DIAGNOSE_PASSED     7
+#define SR0_TRANSMIT_NO_CRC_DONE 9
+#define SR0_RETRANSMIT_DONE     12
+#define SR0_EXECUTION_ABORTED   13
+#define SR0_END_OF_FRAME        8
+#define SR0_RECEPTION_ABORTED   10
+#define SR0_DIAGNOSE_FAILED     15
+#define SR0_STOP_REG_HIT        11
+#define SR0_CHNL                (1 << 4)
+#define SR0_EXECUTION           (1 << 5)
+#define SR0_RECEPTION           (1 << 6)
+#define SR0_INTERRUPT           (1 << 7)
+#define SR0_BOTH_RX_TX          (SR0_EXECUTION | SR0_RECEPTION)
+#define SR3_EXEC_STATE_MASK     0x03
+#define SR3_EXEC_IDLE           0
+#define SR3_TX_ABORT_IN_PROGRESS 1
+#define SR3_EXEC_ACTIVE         2
+#define SR3_ABORT_IN_PROGRESS   3
+#define SR3_EXEC_CHNL           (1 << 2)
+#define SR3_STP_ON_NO_RSRC      (1 << 3)
+#define SR3_RCVING_NO_RSRC      (1 << 4)
+#define SR3_RCV_STATE_MASK      0x60
+#define SR3_RCV_IDLE            0x00
+#define SR3_RCV_READY           0x20
+#define SR3_RCV_ACTIVE          0x40
+#define SR3_RCV_STOP_IN_PROG    0x60
+#define SR3_RCV_CHNL            (1 << 7)
+/* Port 1 Command Register definitions */
+#define OP1_NOP                 0
+#define OP1_SWIT_TO_PORT_0      1
+#define OP1_INT_DISABLE         2
+#define OP1_INT_ENABLE          3
+#define OP1_SET_TS              5
+#define OP1_RST_TS              7
+#define OP1_POWER_DOWN          8
+#define OP1_RESET_RING_MNGMT    11
+#define OP1_RESET               14
+#define OP1_SEL_RST             15
+#define CR1_STATUS_4            0x00
+#define CR1_STATUS_5            0x20
+#define CR1_STATUS_6            0x40
+#define CR1_STOP_REG_UPDATE     (1 << 7)
+/* Receive frame status bits */
+#define RX_RCLD                 (1 << 0)
+#define RX_IA_MATCH             (1 << 1)
+#define RX_NO_AD_MATCH          (1 << 2)
+#define RX_NO_SFD               (1 << 3)
+#define RX_SRT_FRM              (1 << 7)
+#define RX_OVRRUN               (1 << 8)
+#define RX_ALG_ERR              (1 << 10)
+#define RX_CRC_ERR              (1 << 11)
+#define RX_LEN_ERR              (1 << 12)
+#define RX_RCV_OK               (1 << 13)
+#define RX_TYP_LEN              (1 << 15)
+/* Transmit status bits */
+#define TX_NCOL_MASK            0x0f
+#define TX_FRTL                 (1 << 4)
+#define TX_MAX_COL              (1 << 5)
+#define TX_HRT_BEAT             (1 << 6)
+#define TX_DEFER                (1 << 7)
+#define TX_UND_RUN              (1 << 8)
+#define TX_LOST_CTS             (1 << 9)
+#define TX_LOST_CRS             (1 << 10)
+#define TX_LTCOL                (1 << 11)
+#define TX_OK                   (1 << 13)
+#define TX_COLL                 (1 << 15)
+struct i82593_conf_block {
+  u_char fifo_limit : 4,
+         forgnesi   : 1,
+         fifo_32    : 1,
+         d6mod      : 1,
+         throttle_enb : 1;
+  u_char throttle   : 6,
+         cntrxint   : 1,
+         contin     : 1;
+  u_char addr_len   : 3,
+         acloc      : 1,
+         preamb_len : 2,
+         loopback   : 2;
+  u_char lin_prio   : 3,
+         tbofstop   : 1,
+         exp_prio   : 3,
+         bof_met    : 1;
+  u_char            : 4,
+         ifrm_spc   : 4;
+  u_char            : 5,
+         slottim_low : 3;
+  u_char slottim_hi : 3,
+                    : 1,
+         max_retr   : 4;
+  u_char prmisc     : 1,
+         bc_dis     : 1,
+                    : 1,
+         crs_1      : 1,
+         nocrc_ins  : 1,
+         crc_1632   : 1,
+                    : 1,
+         crs_cdt    : 1;
+  u_char cs_filter  : 3,
+         crs_src    : 1,
+         cd_filter  : 3,
+                    : 1;
+  u_char            : 2,
+         min_fr_len : 6;
+  u_char lng_typ    : 1,
+         lng_fld    : 1,
+         rxcrc_xf   : 1,
+         artx       : 1,
+         sarec      : 1,
+         tx_jabber  : 1,        /* why is this called max_len in the manual? */
+         hash_1     : 1,
+         lbpkpol    : 1;
+  u_char            : 6,
+         fdx        : 1,
+                    : 1;
+  u_char dummy_6    : 6,        /* supposed to be ones */
+         mult_ia    : 1,
+         dis_bof    : 1;
+  u_char dummy_1    : 1,        /* supposed to be one */
+         tx_ifs_retrig : 2,
+         mc_all     : 1,
+         rcv_mon    : 2,
+         frag_acpt  : 1,
+         tstrttrs   : 1;
+  u_char fretx      : 1,
+         runt_eop   : 1,
+         hw_sw_pin  : 1,
+         big_endn   : 1,
+         syncrqs    : 1,
+         sttlen     : 1,
+         tx_eop     : 1,
+         rx_eop     : 1;
+  u_char rbuf_size  : 5,
+         rcvstop    : 1,
+                    : 2;
+};
+#define I82593_MAX_MULTICAST_ADDRESSES  128     /* Hardware hashed filter */
+#endif /* _I82593_H */
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 52e15e079c61..d9724a28c0c2 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -115,7 +115,6 @@
 #define IEEE80211_MAX_SSID_LEN          32
 #define IEEE80211_MAX_MESH_ID_LEN       32
-#define IEEE80211_MESH_CONFIG_LEN       24
 #define IEEE80211_QOS_CTL_LEN           2
 #define IEEE80211_QOS_CTL_TID_MASK      0x000F
@@ -472,7 +471,7 @@ static inline int ieee80211_is_cfendack(__le16 fc)
 }
 /**
- * ieee80211_is_nullfunc - check if FTYPE=IEEE80211_FTYPE_DATA and STYPE=IEEE80211_STYPE_NULLFUNC
+ * ieee80211_is_nullfunc - check if frame is a regular (non-QoS) nullfunc frame
 * @fc: frame control bytes in little-endian byteorder
 */
 static inline int ieee80211_is_nullfunc(__le16 fc)
@@ -481,6 +480,16 @@ static inline int ieee80211_is_nullfunc(__le16 fc)
               cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC);
 }
+/**
+ * ieee80211_is_qos_nullfunc - check if frame is a QoS nullfunc frame
+ * @fc: frame control bytes in little-endian byteorder
+ */
+static inline int ieee80211_is_qos_nullfunc(__le16 fc)
+{
+        return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) ==
+               cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);
+}
 struct ieee80211s_hdr {
        u8 flags;
        u8 ttl;
@@ -544,6 +553,35 @@ struct ieee80211_tim_ie {
        u8 virtual_map[1];
 } __attribute__ ((packed));
+/**
+ * struct ieee80211_meshconf_ie
+ *
+ * This structure refers to "Mesh Configuration information element"
+ */
+struct ieee80211_meshconf_ie {
+        u8 meshconf_psel;
+        u8 meshconf_pmetric;
+        u8 meshconf_congest;
+        u8 meshconf_synch;
+        u8 meshconf_auth;
+        u8 meshconf_form;
+        u8 meshconf_cap;
+} __attribute__ ((packed));
+/**
+ * struct ieee80211_rann_ie
+ *
+ * This structure refers to "Root Announcement information element"
+ */
+struct ieee80211_rann_ie {
+        u8 rann_flags;
+        u8 rann_hopcount;
+        u8 rann_ttl;
+        u8 rann_addr[6];
+        u32 rann_seq;
+        u32 rann_metric;
+} __attribute__ ((packed));
 #define WLAN_SA_QUERY_TR_ID_LEN 2
 struct ieee80211_mgmt {
@@ -1060,6 +1098,7 @@ enum ieee80211_eid {
        WLAN_EID_PREQ = 68,
        WLAN_EID_PREP = 69,
        WLAN_EID_PERR = 70,
+        WLAN_EID_RANN = 49,     /* compatible with FreeBSD */
        /* 802.11h */
        WLAN_EID_PWR_CONSTRAINT = 32,
        WLAN_EID_PWR_CAPABILITY = 33,
@@ -1227,6 +1266,8 @@ enum ieee80211_sa_query_action {
 #define WLAN_MAX_KEY_LEN                32
+#define WLAN_PMKID_LEN                  16
 /**
 * ieee80211_get_qos_ctl - get pointer to qos control bytes
 * @hdr: the frame
diff --git a/include/linux/if.h b/include/linux/if.h
index b9a6229f3be7..3a9f410a296b 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -70,6 +70,7 @@
 #define IFF_XMIT_DST_RELEASE 0x400      /* dev_hard_start_xmit() is allowed to
                                         * release skb->dst
                                         */
+#define IFF_DONT_BRIDGE 0x800           /* disallow bridging this ether dev */
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
@@ -125,8 +126,7 @@ enum {
 *      being very small might be worth keeping for clean configuration.
 */
-struct ifmap 
+struct ifmap {
-{
        unsigned long mem_start;
        unsigned long mem_end;
        unsigned short base_addr; 
@@ -136,8 +136,7 @@ struct ifmap
        /* 3 bytes spare */
 };
-struct if_settings
+struct if_settings {
-{
        unsigned int type;      /* Type of physical device or protocol */
        unsigned int size;      /* Size of the data allocated by the caller */
        union {
@@ -161,8 +160,7 @@ struct if_settings
 * remainder may be interface specific.
 */
-struct ifreq 
+struct ifreq {
-{
 #define IFHWADDRLEN     6
        union
        {
@@ -211,11 +209,9 @@ struct ifreq
 * must know all networks accessible).
 */
-struct ifconf 
+struct ifconf  {
-{
        int     ifc_len;                        /* size of buffer       */
-        union 
+        union {
-        {
                char __user *ifcu_buf;
                struct ifreq __user *ifcu_req;
        } ifc_ifcu;
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index fd9740466757..23357ab81a77 100644
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
-struct ifaddrmsg
+struct ifaddrmsg {
-{
        __u8            ifa_family;
        __u8            ifa_prefixlen;  /* The prefix length            */
        __u8            ifa_flags;      /* Flags                        */
@@ -20,8 +19,7 @@ struct ifaddrmsg
 * but for point-to-point IFA_ADDRESS is DESTINATION address,
 * local address is supplied in IFA_LOCAL attribute.
 */
-enum
+enum {
-{
        IFA_UNSPEC,
        IFA_ADDRESS,
        IFA_LOCAL,
@@ -47,8 +45,7 @@ enum
 #define IFA_F_TENTATIVE         0x40
 #define IFA_F_PERMANENT         0x80
-struct ifa_cacheinfo
+struct ifa_cacheinfo {
-{
        __u32   ifa_prefered;
        __u32   ifa_valid;
        __u32   cstamp; /* created timestamp, hundredths of seconds */
diff --git a/include/linux/if_addrlabel.h b/include/linux/if_addrlabel.h
index 89571f65d6de..54580c298187 100644
--- a/include/linux/if_addrlabel.h
+++ b/include/linux/if_addrlabel.h
@@ -12,8 +12,7 @@
 #include <linux/types.h>
-struct ifaddrlblmsg
+struct ifaddrlblmsg {
-{
        __u8            ifal_family;            /* Address family */
        __u8            __ifal_reserved;        /* Reserved */
        __u8            ifal_prefixlen;         /* Prefix length */
@@ -22,8 +21,7 @@ struct ifaddrlblmsg
        __u32           ifal_seq;               /* sequence number */
 };
-enum
+enum {
-{
        IFAL_ADDRESS = 1,
        IFAL_LABEL = 2,
        __IFAL_MAX
diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index 0835debab115..46e34bd0e783 100644
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -56,8 +56,7 @@
 /*
 * The RFC1201-specific components of an arcnet packet header.
 */
-struct arc_rfc1201
+struct arc_rfc1201 {
-{
    __u8  proto;                /* protocol ID field - varies           */
    __u8  split_flag;   /* for use with split packets           */
    __be16   sequence;          /* sequence number                      */
@@ -69,8 +68,7 @@ struct arc_rfc1201
 /*
 * The RFC1051-specific components.
 */
-struct arc_rfc1051
+struct arc_rfc1051 {
-{
    __u8 proto;         /* ARC_P_RFC1051_ARP/RFC1051_IP */
    __u8 payload[0];            /* 507 bytes                    */
 };
@@ -81,8 +79,7 @@ struct arc_rfc1051
 * The ethernet-encap-specific components.  We have a real ethernet header
 * and some data.
 */
-struct arc_eth_encap
+struct arc_eth_encap {
-{
    __u8 proto;         /* Always ARC_P_ETHER                   */
    struct ethhdr eth;          /* standard ethernet header (yuck!)     */
    __u8 payload[0];            /* 493 bytes                            */
@@ -90,8 +87,7 @@ struct arc_eth_encap
 #define ETH_ENCAP_HDR_SIZE 14
-struct arc_cap
+struct arc_cap {
-{
        __u8 proto;
        __u8 cookie[sizeof(int)];   /* Actually NOT sent over the network */
        union {
@@ -108,8 +104,7 @@ struct arc_cap
 * the _end_ of the 512-byte buffer.  We hide this complexity inside the
 * driver.
 */
-struct arc_hardware
+struct arc_hardware {
-{
    __u8  source,               /* source ARCnet - filled in automagically */
             dest,              /* destination ARCnet - 0 for broadcast    */
             offset[2];         /* offset bytes (some weird semantics)     */
@@ -120,8 +115,7 @@ struct arc_hardware
 * This is an ARCnet frame header, as seen by the kernel (and userspace,
 * when you do a raw packet capture).
 */
-struct archdr
+struct archdr {
-{
    /* hardware requirements */
    struct arc_hardware hard;
     
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 282eb37e2dec..e80b7f88f7c6 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -133,8 +133,7 @@ struct arpreq_old {
 *      This structure defines an ethernet arp header.
 */
-struct arphdr
+struct arphdr {
-{
        __be16          ar_hrd;         /* format of hardware address   */
        __be16          ar_pro;         /* format of protocol address   */
        unsigned char   ar_hln;         /* length of hardware address   */
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h
index 65c2d247068b..cd525fae3c98 100644
--- a/include/linux/if_bonding.h
+++ b/include/linux/if_bonding.h
@@ -94,8 +94,7 @@ typedef struct ifbond {
        __s32 miimon;
 } ifbond;
-typedef struct ifslave
+typedef struct ifslave {
-{
        __s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */
        char slave_name[IFNAMSIZ];
        __s8 link;
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 6badb3e2c4e4..938b7e81df95 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -49,8 +49,7 @@
 #define BR_STATE_FORWARDING 3
 #define BR_STATE_BLOCKING 4
-struct __bridge_info
+struct __bridge_info {
-{
        __u64 designated_root;
        __u64 bridge_id;
        __u32 root_path_cost;
@@ -72,8 +71,7 @@ struct __bridge_info
        __u32 gc_timer_value;
 };
-struct __port_info
+struct __port_info {
-{
        __u64 designated_root;
        __u64 designated_bridge;
        __u16 port_id;
@@ -89,8 +87,7 @@ struct __port_info
        __u32 hold_timer_value;
 };
-struct __fdb_entry
+struct __fdb_entry {
-{
        __u8 mac_addr[6];
        __u8 port_no;
        __u8 is_local;
diff --git a/include/linux/if_ec.h b/include/linux/if_ec.h
index e7499aa79783..d85f9f48129f 100644
--- a/include/linux/if_ec.h
+++ b/include/linux/if_ec.h
@@ -5,14 +5,12 @@
 /* User visible stuff. Glibc provides its own but libc5 folk will use these */
-struct ec_addr
+struct ec_addr {
-{
  unsigned char station;                /* Station number.  */
  unsigned char net;                    /* Network number.  */
 };
-struct sockaddr_ec
+struct sockaddr_ec {
-{
  unsigned short sec_family;
  unsigned char port;                   /* Port number.  */
  unsigned char cb;                     /* Control/flag byte.  */
@@ -37,8 +35,7 @@ struct sockaddr_ec
 #define EC_HLEN                         6
 /* This is what an Econet frame looks like on the wire. */
-struct ec_framehdr 
+struct ec_framehdr {
-{
  unsigned char dst_stn;
  unsigned char dst_net;
  unsigned char src_stn;
@@ -62,8 +59,7 @@ static inline struct econet_sock *ec_sk(const struct sock *sk)
        return (struct econet_sock *)sk;
 }
-struct ec_device
+struct ec_device {
-{
  unsigned char station, net;           /* Econet protocol address */
 };
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 580b6004d00e..005e1525ab86 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -136,10 +136,6 @@ extern struct ctl_table ether_table[];
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
-/*
- *      Display a 6 byte device address (MAC) in a readable format.
- */
-extern char *print_mac(char *buf, const unsigned char *addr) __deprecated;
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_BUF_SIZE    18
 #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE]
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index 45de1046dbbf..5459c5c09930 100644
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -63,36 +63,32 @@
 #define FDDI_UI_CMD                     0x03
 /* Define 802.2 Type 1 header */
-struct fddi_8022_1_hdr
+struct fddi_8022_1_hdr {
-        {
        __u8    dsap;                                   /* destination service access point */
        __u8    ssap;                                   /* source service access point */
        __u8    ctrl;                                   /* control byte #1 */
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 /* Define 802.2 Type 2 header */
-struct fddi_8022_2_hdr
+struct fddi_8022_2_hdr {
-        {
        __u8    dsap;                                   /* destination service access point */
        __u8    ssap;                                   /* source service access point */
        __u8    ctrl_1;                                 /* control byte #1 */
        __u8    ctrl_2;                                 /* control byte #2 */
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 /* Define 802.2 SNAP header */
 #define FDDI_K_OUI_LEN  3
-struct fddi_snap_hdr
+struct fddi_snap_hdr {
-        {
        __u8    dsap;                                   /* always 0xAA */
        __u8    ssap;                                   /* always 0xAA */
        __u8    ctrl;                                   /* always 0x03 */
        __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
        __be16  ethertype;                              /* packet type ID field */
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 /* Define FDDI LLC frame header */
-struct fddihdr
+struct fddihdr {
-        {
        __u8    fc;                                             /* frame control */
        __u8    daddr[FDDI_K_ALEN];             /* destination address */
        __u8    saddr[FDDI_K_ALEN];             /* source address */
@@ -102,7 +98,7 @@ struct fddihdr
                struct fddi_8022_2_hdr          llc_8022_2;
                struct fddi_snap_hdr            llc_snap;
                } hdr;
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 #ifdef __KERNEL__
 #include <linux/netdevice.h>
@@ -197,7 +193,7 @@ struct fddi_statistics {
        __u32   port_pc_withhold[2];
        __u32   port_ler_flag[2];
        __u32   port_hardware_present[2];
-        };
+};
 #endif /* __KERNEL__ */
 #endif  /* _LINUX_IF_FDDI_H */
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h
index 4a7c9940b080..8d038eb8db5c 100644
--- a/include/linux/if_hippi.h
+++ b/include/linux/if_hippi.h
@@ -51,8 +51,7 @@
 *      HIPPI statistics collection data. 
 */
 
-struct hipnet_statistics
+struct hipnet_statistics {
-{
        int     rx_packets;             /* total packets received       */
        int     tx_packets;             /* total packets transmitted    */
        int     rx_errors;              /* bad packets received         */
@@ -77,8 +76,7 @@ struct hipnet_statistics
 };
-struct hippi_fp_hdr
+struct hippi_fp_hdr {
-{
 #if 0
        __u8            ulp;                            /* must contain 4 */
 #if defined (__BIG_ENDIAN_BITFIELD)
@@ -108,8 +106,7 @@ struct hippi_fp_hdr
        __be32          d2_size;
 } __attribute__ ((packed));
-struct hippi_le_hdr
+struct hippi_le_hdr {
-{
 #if defined (__BIG_ENDIAN_BITFIELD)
        __u8            fc:3;
        __u8            double_wide:1;
@@ -139,8 +136,7 @@ struct hippi_le_hdr
 * Looks like the dsap and ssap fields have been swapped by mistake in
 * RFC 2067 "IP over HIPPI".
 */
-struct hippi_snap_hdr
+struct hippi_snap_hdr {
-{
        __u8    dsap;                   /* always 0xAA */
        __u8    ssap;                   /* always 0xAA */
        __u8    ctrl;                   /* always 0x03 */
@@ -148,8 +144,7 @@ struct hippi_snap_hdr
        __be16  ethertype;              /* packet type ID field */
 } __attribute__ ((packed));
-struct hippi_hdr
+struct hippi_hdr {
-{
        struct hippi_fp_hdr     fp;
        struct hippi_le_hdr     le;
        struct hippi_snap_hdr   snap;
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 176c5182c515..6674791622ca 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -5,8 +5,7 @@
 #include <linux/netlink.h>
 /* The struct should be in sync with struct net_device_stats */
-struct rtnl_link_stats
+struct rtnl_link_stats {
-{
        __u32   rx_packets;             /* total packets received       */
        __u32   tx_packets;             /* total packets transmitted    */
        __u32   rx_bytes;               /* total bytes received         */
@@ -39,8 +38,7 @@ struct rtnl_link_stats
 };
 /* The struct should be in sync with struct ifmap */
-struct rtnl_link_ifmap
+struct rtnl_link_ifmap {
-{
        __u64   mem_start;
        __u64   mem_end;
        __u64   base_addr;
@@ -49,8 +47,7 @@ struct rtnl_link_ifmap
        __u8    port;
 };
-enum
+enum {
-{
        IFLA_UNSPEC,
        IFLA_ADDRESS,
        IFLA_BROADCAST,
@@ -123,8 +120,7 @@ enum
 */
 /* Subtype attributes for IFLA_PROTINFO */
-enum
+enum {
-{
        IFLA_INET6_UNSPEC,
        IFLA_INET6_FLAGS,       /* link flags                   */
        IFLA_INET6_CONF,        /* sysctl parameters            */
@@ -137,16 +133,14 @@ enum
 #define IFLA_INET6_MAX  (__IFLA_INET6_MAX - 1)
-struct ifla_cacheinfo
+struct ifla_cacheinfo {
-{
        __u32   max_reasm_len;
        __u32   tstamp;         /* ipv6InterfaceTable updated timestamp */
        __u32   reachable_time;
        __u32   retrans_time;
 };
-enum
+enum {
-{
        IFLA_INFO_UNSPEC,
        IFLA_INFO_KIND,
        IFLA_INFO_DATA,
@@ -158,8 +152,7 @@ enum
 /* VLAN section */
-enum
+enum {
-{
        IFLA_VLAN_UNSPEC,
        IFLA_VLAN_ID,
        IFLA_VLAN_FLAGS,
@@ -175,8 +168,7 @@ struct ifla_vlan_flags {
        __u32   mask;
 };
-enum
+enum {
-{
        IFLA_VLAN_QOS_UNSPEC,
        IFLA_VLAN_QOS_MAPPING,
        __IFLA_VLAN_QOS_MAX
@@ -184,10 +176,24 @@ enum
 #define IFLA_VLAN_QOS_MAX       (__IFLA_VLAN_QOS_MAX - 1)
-struct ifla_vlan_qos_mapping
+struct ifla_vlan_qos_mapping {
-{
        __u32 from;
        __u32 to;
 };
+/* MACVLAN section */
+enum {
+        IFLA_MACVLAN_UNSPEC,
+        IFLA_MACVLAN_MODE,
+        __IFLA_MACVLAN_MAX,
+};
+#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1)
+enum macvlan_mode {
+        MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */
+        MACVLAN_MODE_VEPA    = 2, /* talk to other ports through ext bridge */
+        MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
+};
 #endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index dea7d6b7cf98..4021d47cc437 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -3,15 +3,13 @@
 #include <linux/types.h>
-struct sockaddr_pkt
+struct sockaddr_pkt {
-{
        unsigned short spkt_family;
        unsigned char spkt_device[14];
        __be16 spkt_protocol;
 };
-struct sockaddr_ll
+struct sockaddr_ll {
-{
        unsigned short  sll_family;
        __be16          sll_protocol;
        int             sll_ifindex;
@@ -49,14 +47,12 @@ struct sockaddr_ll
 #define PACKET_TX_RING                  13
 #define PACKET_LOSS                     14
-struct tpacket_stats
+struct tpacket_stats {
-{
        unsigned int    tp_packets;
        unsigned int    tp_drops;
 };
-struct tpacket_auxdata
+struct tpacket_auxdata {
-{
        __u32           tp_status;
        __u32           tp_len;
        __u32           tp_snaplen;
@@ -78,8 +74,7 @@ struct tpacket_auxdata
 #define TP_STATUS_SENDING       0x2
 #define TP_STATUS_WRONG_FORMAT  0x4
-struct tpacket_hdr
+struct tpacket_hdr {
-{
        unsigned long   tp_status;
        unsigned int    tp_len;
        unsigned int    tp_snaplen;
@@ -93,8 +88,7 @@ struct tpacket_hdr
 #define TPACKET_ALIGN(x)        (((x)+TPACKET_ALIGNMENT-1)&~(TPACKET_ALIGNMENT-1))
 #define TPACKET_HDRLEN          (TPACKET_ALIGN(sizeof(struct tpacket_hdr)) + sizeof(struct sockaddr_ll))
-struct tpacket2_hdr
+struct tpacket2_hdr {
-{
        __u32           tp_status;
        __u32           tp_len;
        __u32           tp_snaplen;
@@ -107,8 +101,7 @@ struct tpacket2_hdr
 #define TPACKET2_HDRLEN         (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))
-enum tpacket_versions
+enum tpacket_versions {
-{
        TPACKET_V1,
        TPACKET_V2,
 };
@@ -126,16 +119,14 @@ enum tpacket_versions
   - Pad to align to TPACKET_ALIGNMENT=16
 */
-struct tpacket_req
+struct tpacket_req {
-{
        unsigned int    tp_block_size;  /* Minimal size of contiguous block */
        unsigned int    tp_block_nr;    /* Number of blocks */
        unsigned int    tp_frame_size;  /* Size of frame */
        unsigned int    tp_frame_nr;    /* Total number of frames */
 };
-struct packet_mreq
+struct packet_mreq {
-{
        int             mr_ifindex;
        unsigned short  mr_type;
        unsigned short  mr_alen;
diff --git a/include/linux/if_plip.h b/include/linux/if_plip.h
index 153a649915a2..6298c7e88b2b 100644
--- a/include/linux/if_plip.h
+++ b/include/linux/if_plip.h
@@ -15,8 +15,7 @@
 #define SIOCDEVPLIP     SIOCDEVPRIVATE
-struct plipconf
+struct plipconf {
-{
        unsigned short pcmd;
        unsigned long  nibble;
        unsigned long  trigger;
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index 3a14b088c8ec..c58baea4a25b 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -24,8 +24,7 @@
 /* Structure used to connect() the socket to a particular tunnel UDP
 * socket.
 */
-struct pppol2tp_addr
+struct pppol2tp_addr {
-{
        __kernel_pid_t  pid;            /* pid that owns the fd.
                                         * 0 => current */
        int     fd;                     /* FD of UDP socket to use */
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 5a9aae4adb44..1822d635be6b 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -5,6 +5,7 @@
 #ifdef __KERNEL__
 #include <linux/ip.h>
+#include <linux/in6.h>
 #endif
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
@@ -15,6 +16,10 @@
 #define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
 #define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
 #define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
+#define SIOCGET6RD      (SIOCDEVPRIVATE + 8)
+#define SIOCADD6RD      (SIOCDEVPRIVATE + 9)
+#define SIOCDEL6RD      (SIOCDEVPRIVATE + 10)
+#define SIOCCHG6RD      (SIOCDEVPRIVATE + 11)
 #define GRE_CSUM        __cpu_to_be16(0x8000)
 #define GRE_ROUTING     __cpu_to_be16(0x4000)
@@ -25,8 +30,7 @@
 #define GRE_FLAGS       __cpu_to_be16(0x00F8)
 #define GRE_VERSION     __cpu_to_be16(0x0007)
-struct ip_tunnel_parm
+struct ip_tunnel_parm {
-{
        char                    name[IFNAMSIZ];
        int                     link;
        __be16                  i_flags;
@@ -51,8 +55,14 @@ struct ip_tunnel_prl {
 /* PRL flags */
 #define PRL_DEFAULT             0x0001
-enum
+struct ip_tunnel_6rd {
-{
+        struct in6_addr         prefix;
+        __be32                  relay_prefix;
+        __u16                   prefixlen;
+        __u16                   relay_prefixlen;
+};
+enum {
        IFLA_GRE_UNSPEC,
        IFLA_GRE_LINK,
        IFLA_GRE_IFLAGS,
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 7ff9af1d0f05..3d870fda8c4f 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -63,7 +63,11 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
        return (struct vlan_ethhdr *)skb_mac_header(skb);
 }
-#define VLAN_VID_MASK   0xfff
+#define VLAN_PRIO_MASK          0xe000 /* Priority Code Point */
+#define VLAN_PRIO_SHIFT         13
+#define VLAN_CFI_MASK           0x1000 /* Canonical Format Indicator */
+#define VLAN_TAG_PRESENT        VLAN_CFI_MASK
+#define VLAN_VID_MASK           0x0fff /* VLAN Identifier */
 /* found in socket.c */
 extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
@@ -81,6 +85,7 @@ struct vlan_group {
                                            * the vlan is attached to.
                                            */
        unsigned int            nr_vlans;
+        int                     killall;
        struct hlist_node       hlist;  /* linked list */
        struct net_device **vlan_devices_arrays[VLAN_GROUP_ARRAY_SPLIT_PARTS];
        struct rcu_head         rcu;
@@ -105,8 +110,8 @@ static inline void vlan_group_set_device(struct vlan_group *vg,
        array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] = dev;
 }
-#define vlan_tx_tag_present(__skb)      ((__skb)->vlan_tci)
+#define vlan_tx_tag_present(__skb)      ((__skb)->vlan_tci & VLAN_TAG_PRESENT)
-#define vlan_tx_tag_get(__skb)          ((__skb)->vlan_tci)
+#define vlan_tx_tag_get(__skb)          ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);
@@ -115,10 +120,12 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev);
 extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
                             u16 vlan_tci, int polling);
 extern int vlan_hwaccel_do_receive(struct sk_buff *skb);
-extern int vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
+extern gro_result_t
-                            unsigned int vlan_tci, struct sk_buff *skb);
+vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
-extern int vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+                 unsigned int vlan_tci, struct sk_buff *skb);
-                          unsigned int vlan_tci);
+extern gro_result_t
+vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+               unsigned int vlan_tci);
 #else
 static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)
@@ -145,17 +152,18 @@ static inline int vlan_hwaccel_do_receive(struct sk_buff *skb)
        return 0;
 }
-static inline int vlan_gro_receive(struct napi_struct *napi,
+static inline gro_result_t
-                                   struct vlan_group *grp,
+vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
-                                   unsigned int vlan_tci, struct sk_buff *skb)
+                 unsigned int vlan_tci, struct sk_buff *skb)
 {
-        return NET_RX_DROP;
+        return GRO_DROP;
 }
-static inline int vlan_gro_frags(struct napi_struct *napi,
+static inline gro_result_t
-                                 struct vlan_group *grp, unsigned int vlan_tci)
+vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+               unsigned int vlan_tci)
 {
-        return NET_RX_DROP;
+        return GRO_DROP;
 }
 #endif
@@ -231,7 +239,7 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
 static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb,
                                                     u16 vlan_tci)
 {
-        skb->vlan_tci = vlan_tci;
+        skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci;
        return skb;
 }
@@ -284,7 +292,7 @@ static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,
                                         u16 *vlan_tci)
 {
        if (vlan_tx_tag_present(skb)) {
-                *vlan_tci = skb->vlan_tci;
+                *vlan_tci = vlan_tx_tag_get(skb);
                return 0;
        } else {
                *vlan_tci = 0;
@@ -331,6 +339,7 @@ enum vlan_ioctl_cmds {
 enum vlan_flags {
        VLAN_FLAG_REORDER_HDR   = 0x1,
        VLAN_FLAG_GVRP          = 0x2,
+        VLAN_FLAG_LOOSE_BINDING = 0x4,
 };
 enum vlan_name_types {
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index fe158e0e20e6..724c27e5d173 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -27,8 +27,7 @@
 *      Header in on cable format
 */
-struct igmphdr
+struct igmphdr {
-{
        __u8 type;
        __u8 code;              /* For newer IGMP */
        __sum16 csum;
@@ -151,8 +150,7 @@ static inline struct igmpv3_query *
 extern int sysctl_igmp_max_memberships;
 extern int sysctl_igmp_max_msf;
-struct ip_sf_socklist
+struct ip_sf_socklist {
-{
        unsigned int            sl_max;
        unsigned int            sl_count;
        __be32                  sl_addr[0];
@@ -167,16 +165,14 @@ struct ip_sf_socklist
   this list never used in fast path code
 */
-struct ip_mc_socklist
+struct ip_mc_socklist {
-{
        struct ip_mc_socklist   *next;
        struct ip_mreqn         multi;
        unsigned int            sfmode;         /* MCAST_{INCLUDE,EXCLUDE} */
        struct ip_sf_socklist   *sflist;
 };
-struct ip_sf_list
+struct ip_sf_list {
-{
        struct ip_sf_list       *sf_next;
        __be32                  sf_inaddr;
        unsigned long           sf_count[2];    /* include/exclude counts */
@@ -185,8 +181,7 @@ struct ip_sf_list
        unsigned char           sf_crcount;     /* retrans. left to send */
 };
-struct ip_mc_list
+struct ip_mc_list {
-{
        struct in_device        *interface;
        __be32                  multiaddr;
        struct ip_sf_list       *sources;
diff --git a/include/linux/in.h b/include/linux/in.h
index cf196da04ec9..b615649db129 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -118,14 +118,12 @@ struct in_addr {
 /* Request struct for multicast socket ops */
-struct ip_mreq 
+struct ip_mreq  {
-{
        struct in_addr imr_multiaddr;   /* IP multicast address of group */
        struct in_addr imr_interface;   /* local IP address of interface */
 };
-struct ip_mreqn
+struct ip_mreqn {
-{
        struct in_addr  imr_multiaddr;          /* IP multicast address of group */
        struct in_addr  imr_address;            /* local IP address of interface */
        int             imr_ifindex;            /* Interface index */
@@ -149,21 +147,18 @@ struct ip_msfilter {
        (sizeof(struct ip_msfilter) - sizeof(__u32) \
        + (numsrc) * sizeof(__u32))
-struct group_req
+struct group_req {
-{
        __u32                            gr_interface;  /* interface index */
        struct __kernel_sockaddr_storage gr_group;      /* group address */
 };
-struct group_source_req
+struct group_source_req {
-{
        __u32                            gsr_interface; /* interface index */
        struct __kernel_sockaddr_storage gsr_group;     /* group address */
        struct __kernel_sockaddr_storage gsr_source;    /* source address */
 };
-struct group_filter
+struct group_filter {
-{
        __u32                            gf_interface;  /* interface index */
        struct __kernel_sockaddr_storage gf_group;      /* multicast address */
        __u32                            gf_fmode;      /* filter mode */
@@ -175,8 +170,7 @@ struct group_filter
        (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
        + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
-struct in_pktinfo
+struct in_pktinfo {
-{
        int             ipi_ifindex;
        struct in_addr  ipi_spec_dst;
        struct in_addr  ipi_addr;
diff --git a/include/linux/in6.h b/include/linux/in6.h
index 718bf21c5754..dfa29168e6ab 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -27,10 +27,8 @@
 *      IPv6 address structure
 */
-struct in6_addr
+struct in6_addr {
-{
+        union {
-        union 
-        {
                __u8            u6_addr8[16];
                __be16          u6_addr16[8];
                __be32          u6_addr32[4];
@@ -75,8 +73,7 @@ struct ipv6_mreq {
 #define ipv6mr_acaddr   ipv6mr_multiaddr
-struct in6_flowlabel_req
+struct in6_flowlabel_req {
-{
        struct in6_addr flr_dst;
        __be32  flr_label;
        __u8    flr_action;
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index ad27c7da8798..699e85c01a4d 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -10,15 +10,13 @@
 #include <linux/timer.h>
 #include <linux/sysctl.h>
-struct ipv4_devconf
+struct ipv4_devconf {
-{
        void    *sysctl;
        int     data[__NET_IPV4_CONF_MAX - 1];
        DECLARE_BITMAP(state, __NET_IPV4_CONF_MAX - 1);
 };
-struct in_device
+struct in_device {
-{
        struct net_device       *dev;
        atomic_t                refcnt;
        int                     dead;
@@ -85,6 +83,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
 #define IN_DEV_RPFILTER(in_dev)         IN_DEV_MAXCONF((in_dev), RP_FILTER)
 #define IN_DEV_SOURCE_ROUTE(in_dev)     IN_DEV_ANDCONF((in_dev), \
                                                       ACCEPT_SOURCE_ROUTE)
+#define IN_DEV_ACCEPT_LOCAL(in_dev)     IN_DEV_ORCONF((in_dev), ACCEPT_LOCAL)
 #define IN_DEV_BOOTP_RELAY(in_dev)      IN_DEV_ANDCONF((in_dev), BOOTP_RELAY)
 #define IN_DEV_LOG_MARTIANS(in_dev)     IN_DEV_ORCONF((in_dev), LOG_MARTIANS)
@@ -110,8 +109,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
 #define IN_DEV_ARP_IGNORE(in_dev)       IN_DEV_MAXCONF((in_dev), ARP_IGNORE)
 #define IN_DEV_ARP_NOTIFY(in_dev)       IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)
-struct in_ifaddr
+struct in_ifaddr {
-{
        struct in_ifaddr        *ifa_next;
        struct in_device        *ifa_dev;
        struct rcu_head         rcu_head;
diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
index 148265e63e8d..dfc170362842 100644
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
@@ -127,8 +127,7 @@ struct ip_vs_dest_user {
 /*
 *      IPVS statistics object (for user space)
 */
-struct ip_vs_stats_user
+struct ip_vs_stats_user {
-{
        __u32                   conns;          /* connections scheduled */
        __u32                   inpkts;         /* incoming packets */
        __u32                   outpkts;        /* outgoing packets */
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c662efa68289..e0cc9a7db2b5 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -167,6 +167,7 @@ struct ipv6_devconf {
 #endif
        __s32           disable_ipv6;
        __s32           accept_dad;
+        __s32           force_tllao;
        void            *sysctl;
 };
@@ -207,6 +208,7 @@ enum {
        DEVCONF_MC_FORWARDING,
        DEVCONF_DISABLE_IPV6,
        DEVCONF_ACCEPT_DAD,
+        DEVCONF_FORCE_TLLAO,
        DEVCONF_MAX
 };
@@ -503,7 +505,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk)
 #define INET6_MATCH(__sk, __net, __hash, __saddr, __daddr, __ports, __dif)\
        (((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)   && \
-         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      && \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports)) && \
         ((__sk)->sk_family             == AF_INET6)            && \
         ipv6_addr_equal(&inet6_sk(__sk)->daddr, (__saddr))     && \
         ipv6_addr_equal(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index f8f8900fc5ec..2d241da07236 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -14,12 +14,76 @@
 #define KVM_API_VERSION 12
-/* for KVM_TRACE_ENABLE, deprecated */
+/* *** Deprecated interfaces *** */
+#define KVM_TRC_SHIFT           16
+#define KVM_TRC_ENTRYEXIT       (1 << KVM_TRC_SHIFT)
+#define KVM_TRC_HANDLER         (1 << (KVM_TRC_SHIFT + 1))
+#define KVM_TRC_VMENTRY         (KVM_TRC_ENTRYEXIT + 0x01)
+#define KVM_TRC_VMEXIT          (KVM_TRC_ENTRYEXIT + 0x02)
+#define KVM_TRC_PAGE_FAULT      (KVM_TRC_HANDLER + 0x01)
+#define KVM_TRC_HEAD_SIZE       12
+#define KVM_TRC_CYCLE_SIZE      8
+#define KVM_TRC_EXTRA_MAX       7
+#define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
+#define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
+#define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)
+#define KVM_TRC_IO_READ          (KVM_TRC_HANDLER + 0x05)
+#define KVM_TRC_IO_WRITE         (KVM_TRC_HANDLER + 0x06)
+#define KVM_TRC_CR_READ          (KVM_TRC_HANDLER + 0x07)
+#define KVM_TRC_CR_WRITE         (KVM_TRC_HANDLER + 0x08)
+#define KVM_TRC_DR_READ          (KVM_TRC_HANDLER + 0x09)
+#define KVM_TRC_DR_WRITE         (KVM_TRC_HANDLER + 0x0A)
+#define KVM_TRC_MSR_READ         (KVM_TRC_HANDLER + 0x0B)
+#define KVM_TRC_MSR_WRITE        (KVM_TRC_HANDLER + 0x0C)
+#define KVM_TRC_CPUID            (KVM_TRC_HANDLER + 0x0D)
+#define KVM_TRC_INTR             (KVM_TRC_HANDLER + 0x0E)
+#define KVM_TRC_NMI              (KVM_TRC_HANDLER + 0x0F)
+#define KVM_TRC_VMMCALL          (KVM_TRC_HANDLER + 0x10)
+#define KVM_TRC_HLT              (KVM_TRC_HANDLER + 0x11)
+#define KVM_TRC_CLTS             (KVM_TRC_HANDLER + 0x12)
+#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)
+#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)
+#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)
+#define KVM_TRC_GTLB_WRITE       (KVM_TRC_HANDLER + 0x16)
+#define KVM_TRC_STLB_WRITE       (KVM_TRC_HANDLER + 0x17)
+#define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)
+#define KVM_TRC_PPC_INSTR        (KVM_TRC_HANDLER + 0x19)
 struct kvm_user_trace_setup {
-        __u32 buf_size; /* sub_buffer size of each per-cpu */
+        __u32 buf_size;
-        __u32 buf_nr; /* the number of sub_buffers of each per-cpu */
+        __u32 buf_nr;
+};
+#define __KVM_DEPRECATED_MAIN_W_0x06 \
+        _IOW(KVMIO, 0x06, struct kvm_user_trace_setup)
+#define __KVM_DEPRECATED_MAIN_0x07 _IO(KVMIO, 0x07)
+#define __KVM_DEPRECATED_MAIN_0x08 _IO(KVMIO, 0x08)
+#define __KVM_DEPRECATED_VM_R_0x70 _IOR(KVMIO, 0x70, struct kvm_assigned_irq)
+struct kvm_breakpoint {
+        __u32 enabled;
+        __u32 padding;
+        __u64 address;
+};
+struct kvm_debug_guest {
+        __u32 enabled;
+        __u32 pad;
+        struct kvm_breakpoint breakpoints[4];
+        __u32 singlestep;
 };
+#define __KVM_DEPRECATED_VCPU_W_0x87 _IOW(KVMIO, 0x87, struct kvm_debug_guest)
+/* *** End of deprecated interfaces *** */
 /* for KVM_CREATE_MEMORY_REGION */
 struct kvm_memory_region {
        __u32 slot;
@@ -99,6 +163,7 @@ struct kvm_pit_config {
 /* For KVM_EXIT_INTERNAL_ERROR */
 #define KVM_INTERNAL_ERROR_EMULATION 1
+#define KVM_INTERNAL_ERROR_SIMUL_EX 2
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
@@ -116,6 +181,11 @@ struct kvm_run {
        __u64 cr8;
        __u64 apic_base;
+#ifdef __KVM_S390
+        /* the processor status word for s390 */
+        __u64 psw_mask; /* psw upper half */
+        __u64 psw_addr; /* psw lower half */
+#endif
        union {
                /* KVM_EXIT_UNKNOWN */
                struct {
@@ -167,8 +237,6 @@ struct kvm_run {
                /* KVM_EXIT_S390_SIEIC */
                struct {
                        __u8 icptcode;
-                        __u64 mask; /* psw upper half */
-                        __u64 addr; /* psw lower half */
                        __u16 ipa;
                        __u32 ipb;
                } s390_sieic;
@@ -187,6 +255,9 @@ struct kvm_run {
                } dcr;
                struct {
                        __u32 suberror;
+                        /* Available with KVM_CAP_INTERNAL_ERROR_DATA: */
+                        __u32 ndata;
+                        __u64 data[16];
                } internal;
                /* Fix the size of the union. */
                char padding[256];
@@ -329,24 +400,6 @@ struct kvm_ioeventfd {
        __u8  pad[36];
 };
-#define KVM_TRC_SHIFT           16
-/*
- * kvm trace categories
- */
-#define KVM_TRC_ENTRYEXIT       (1 << KVM_TRC_SHIFT)
-#define KVM_TRC_HANDLER         (1 << (KVM_TRC_SHIFT + 1)) /* only 12 bits */
-/*
- * kvm trace action
- */
-#define KVM_TRC_VMENTRY         (KVM_TRC_ENTRYEXIT + 0x01)
-#define KVM_TRC_VMEXIT          (KVM_TRC_ENTRYEXIT + 0x02)
-#define KVM_TRC_PAGE_FAULT      (KVM_TRC_HANDLER + 0x01)
-#define KVM_TRC_HEAD_SIZE       12
-#define KVM_TRC_CYCLE_SIZE      8
-#define KVM_TRC_EXTRA_MAX       7
 #define KVMIO 0xAE
 /*
@@ -367,12 +420,10 @@ struct kvm_ioeventfd {
 */
 #define KVM_GET_VCPU_MMAP_SIZE    _IO(KVMIO,   0x04) /* in bytes */
 #define KVM_GET_SUPPORTED_CPUID   _IOWR(KVMIO, 0x05, struct kvm_cpuid2)
-/*
+#define KVM_TRACE_ENABLE          __KVM_DEPRECATED_MAIN_W_0x06
- * ioctls for kvm trace
+#define KVM_TRACE_PAUSE           __KVM_DEPRECATED_MAIN_0x07
- */
+#define KVM_TRACE_DISABLE         __KVM_DEPRECATED_MAIN_0x08
-#define KVM_TRACE_ENABLE          _IOW(KVMIO, 0x06, struct kvm_user_trace_setup)
-#define KVM_TRACE_PAUSE           _IO(KVMIO,  0x07)
-#define KVM_TRACE_DISABLE         _IO(KVMIO,  0x08)
 /*
 * Extension capability list.
 */
@@ -436,6 +487,15 @@ struct kvm_ioeventfd {
 #endif
 #define KVM_CAP_IOEVENTFD 36
 #define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
+#ifdef __KVM_HAVE_XEN_HVM
+#define KVM_CAP_XEN_HVM 38
+#endif
+#define KVM_CAP_ADJUST_CLOCK 39
+#define KVM_CAP_INTERNAL_ERROR_DATA 40
+#ifdef __KVM_HAVE_VCPU_EVENTS
+#define KVM_CAP_VCPU_EVENTS 41
+#endif
+#define KVM_CAP_S390_PSW 42
 #ifdef KVM_CAP_IRQ_ROUTING
@@ -488,6 +548,18 @@ struct kvm_x86_mce {
 };
 #endif
+#ifdef KVM_CAP_XEN_HVM
+struct kvm_xen_hvm_config {
+        __u32 flags;
+        __u32 msr;
+        __u64 blob_addr_32;
+        __u64 blob_addr_64;
+        __u8 blob_size_32;
+        __u8 blob_size_64;
+        __u8 pad2[30];
+};
+#endif
 #define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
 struct kvm_irqfd {
@@ -497,55 +569,66 @@ struct kvm_irqfd {
        __u8  pad[20];
 };
+struct kvm_clock_data {
+        __u64 clock;
+        __u32 flags;
+        __u32 pad[9];
+};
 /*
 * ioctls for VM fds
 */
-#define KVM_SET_MEMORY_REGION     _IOW(KVMIO, 0x40, struct kvm_memory_region)
+#define KVM_SET_MEMORY_REGION     _IOW(KVMIO,  0x40, struct kvm_memory_region)
 /*
 * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
 * a vcpu fd.
 */
-#define KVM_CREATE_VCPU           _IO(KVMIO,  0x41)
+#define KVM_CREATE_VCPU           _IO(KVMIO,   0x41)
-#define KVM_GET_DIRTY_LOG         _IOW(KVMIO, 0x42, struct kvm_dirty_log)
+#define KVM_GET_DIRTY_LOG         _IOW(KVMIO,  0x42, struct kvm_dirty_log)
-#define KVM_SET_MEMORY_ALIAS      _IOW(KVMIO, 0x43, struct kvm_memory_alias)
+#define KVM_SET_MEMORY_ALIAS      _IOW(KVMIO,  0x43, struct kvm_memory_alias)
-#define KVM_SET_NR_MMU_PAGES      _IO(KVMIO, 0x44)
+#define KVM_SET_NR_MMU_PAGES      _IO(KVMIO,   0x44)
-#define KVM_GET_NR_MMU_PAGES      _IO(KVMIO, 0x45)
+#define KVM_GET_NR_MMU_PAGES      _IO(KVMIO,   0x45)
-#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46,\
+#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46, \
                                        struct kvm_userspace_memory_region)
-#define KVM_SET_TSS_ADDR          _IO(KVMIO, 0x47)
+#define KVM_SET_TSS_ADDR          _IO(KVMIO,   0x47)
-#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64)
+#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO,  0x48, __u64)
 /* Device model IOC */
-#define KVM_CREATE_IRQCHIP        _IO(KVMIO,  0x60)
+#define KVM_CREATE_IRQCHIP        _IO(KVMIO,   0x60)
-#define KVM_IRQ_LINE              _IOW(KVMIO, 0x61, struct kvm_irq_level)
+#define KVM_IRQ_LINE              _IOW(KVMIO,  0x61, struct kvm_irq_level)
-#define KVM_GET_IRQCHIP           _IOWR(KVMIO, 0x62, struct kvm_irqchip)
+#define KVM_GET_IRQCHIP           _IOWR(KVMIO, 0x62, struct kvm_irqchip)
-#define KVM_SET_IRQCHIP           _IOR(KVMIO,  0x63, struct kvm_irqchip)
+#define KVM_SET_IRQCHIP           _IOR(KVMIO,  0x63, struct kvm_irqchip)
-#define KVM_CREATE_PIT            _IO(KVMIO,  0x64)
+#define KVM_CREATE_PIT            _IO(KVMIO,   0x64)
-#define KVM_GET_PIT               _IOWR(KVMIO, 0x65, struct kvm_pit_state)
+#define KVM_GET_PIT               _IOWR(KVMIO, 0x65, struct kvm_pit_state)
-#define KVM_SET_PIT               _IOR(KVMIO,  0x66, struct kvm_pit_state)
+#define KVM_SET_PIT               _IOR(KVMIO,  0x66, struct kvm_pit_state)
-#define KVM_IRQ_LINE_STATUS       _IOWR(KVMIO, 0x67, struct kvm_irq_level)
+#define KVM_IRQ_LINE_STATUS       _IOWR(KVMIO, 0x67, struct kvm_irq_level)
 #define KVM_REGISTER_COALESCED_MMIO \
                        _IOW(KVMIO,  0x67, struct kvm_coalesced_mmio_zone)
 #define KVM_UNREGISTER_COALESCED_MMIO \
                        _IOW(KVMIO,  0x68, struct kvm_coalesced_mmio_zone)
-#define KVM_ASSIGN_PCI_DEVICE _IOR(KVMIO, 0x69, \
+#define KVM_ASSIGN_PCI_DEVICE     _IOR(KVMIO,  0x69, \
-                                   struct kvm_assigned_pci_dev)
+                                       struct kvm_assigned_pci_dev)
-#define KVM_SET_GSI_ROUTING       _IOW(KVMIO, 0x6a, struct kvm_irq_routing)
+#define KVM_SET_GSI_ROUTING       _IOW(KVMIO,  0x6a, struct kvm_irq_routing)
 /* deprecated, replaced by KVM_ASSIGN_DEV_IRQ */
-#define KVM_ASSIGN_IRQ _IOR(KVMIO, 0x70, \
+#define KVM_ASSIGN_IRQ            __KVM_DEPRECATED_VM_R_0x70
-                            struct kvm_assigned_irq)
+#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO,  0x70, struct kvm_assigned_irq)
-#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO, 0x70, struct kvm_assigned_irq)
+#define KVM_REINJECT_CONTROL      _IO(KVMIO,   0x71)
-#define KVM_REINJECT_CONTROL      _IO(KVMIO, 0x71)
+#define KVM_DEASSIGN_PCI_DEVICE   _IOW(KVMIO,  0x72, \
-#define KVM_DEASSIGN_PCI_DEVICE _IOW(KVMIO, 0x72, \
+                                       struct kvm_assigned_pci_dev)
-                                     struct kvm_assigned_pci_dev)
+#define KVM_ASSIGN_SET_MSIX_NR    _IOW(KVMIO,  0x73, \
-#define KVM_ASSIGN_SET_MSIX_NR \
+                                       struct kvm_assigned_msix_nr)
-                        _IOW(KVMIO, 0x73, struct kvm_assigned_msix_nr)
+#define KVM_ASSIGN_SET_MSIX_ENTRY _IOW(KVMIO,  0x74, \
-#define KVM_ASSIGN_SET_MSIX_ENTRY \
+                                       struct kvm_assigned_msix_entry)
-                        _IOW(KVMIO, 0x74, struct kvm_assigned_msix_entry)
+#define KVM_DEASSIGN_DEV_IRQ      _IOW(KVMIO,  0x75, struct kvm_assigned_irq)
-#define KVM_DEASSIGN_DEV_IRQ       _IOW(KVMIO, 0x75, struct kvm_assigned_irq)
+#define KVM_IRQFD                 _IOW(KVMIO,  0x76, struct kvm_irqfd)
-#define KVM_IRQFD                  _IOW(KVMIO, 0x76, struct kvm_irqfd)
+#define KVM_CREATE_PIT2           _IOW(KVMIO,  0x77, struct kvm_pit_config)
-#define KVM_CREATE_PIT2            _IOW(KVMIO, 0x77, struct kvm_pit_config)
+#define KVM_SET_BOOT_CPU_ID       _IO(KVMIO,   0x78)
-#define KVM_SET_BOOT_CPU_ID        _IO(KVMIO, 0x78)
+#define KVM_IOEVENTFD             _IOW(KVMIO,  0x79, struct kvm_ioeventfd)
-#define KVM_IOEVENTFD             _IOW(KVMIO, 0x79, struct kvm_ioeventfd)
+#define KVM_XEN_HVM_CONFIG        _IOW(KVMIO,  0x7a, struct kvm_xen_hvm_config)
+#define KVM_SET_CLOCK             _IOW(KVMIO,  0x7b, struct kvm_clock_data)
+#define KVM_GET_CLOCK             _IOR(KVMIO,  0x7c, struct kvm_clock_data)
+/* Available with KVM_CAP_PIT_STATE2 */
+#define KVM_GET_PIT2              _IOR(KVMIO,  0x9f, struct kvm_pit_state2)
+#define KVM_SET_PIT2              _IOW(KVMIO,  0xa0, struct kvm_pit_state2)
 /*
 * ioctls for vcpu fds
@@ -558,7 +641,7 @@ struct kvm_irqfd {
 #define KVM_TRANSLATE             _IOWR(KVMIO, 0x85, struct kvm_translation)
 #define KVM_INTERRUPT             _IOW(KVMIO,  0x86, struct kvm_interrupt)
 /* KVM_DEBUG_GUEST is no longer supported, use KVM_SET_GUEST_DEBUG instead */
-#define KVM_DEBUG_GUEST           __KVM_DEPRECATED_DEBUG_GUEST
+#define KVM_DEBUG_GUEST           __KVM_DEPRECATED_VCPU_W_0x87
 #define KVM_GET_MSRS              _IOWR(KVMIO, 0x88, struct kvm_msrs)
 #define KVM_SET_MSRS              _IOW(KVMIO,  0x89, struct kvm_msrs)
 #define KVM_SET_CPUID             _IOW(KVMIO,  0x8a, struct kvm_cpuid)
@@ -570,7 +653,7 @@ struct kvm_irqfd {
 #define KVM_SET_CPUID2            _IOW(KVMIO,  0x90, struct kvm_cpuid2)
 #define KVM_GET_CPUID2            _IOWR(KVMIO, 0x91, struct kvm_cpuid2)
 /* Available with KVM_CAP_VAPIC */
-#define KVM_TPR_ACCESS_REPORTING  _IOWR(KVMIO,  0x92, struct kvm_tpr_access_ctl)
+#define KVM_TPR_ACCESS_REPORTING  _IOWR(KVMIO, 0x92, struct kvm_tpr_access_ctl)
 /* Available with KVM_CAP_VAPIC */
 #define KVM_SET_VAPIC_ADDR        _IOW(KVMIO,  0x93, struct kvm_vapic_addr)
 /* valid for virtual machine (for floating interrupt)_and_ vcpu */
@@ -582,66 +665,23 @@ struct kvm_irqfd {
 /* initial ipl psw for s390 */
 #define KVM_S390_SET_INITIAL_PSW  _IOW(KVMIO,  0x96, struct kvm_s390_psw)
 /* initial reset for s390 */
-#define KVM_S390_INITIAL_RESET    _IO(KVMIO,  0x97)
+#define KVM_S390_INITIAL_RESET    _IO(KVMIO,   0x97)
 #define KVM_GET_MP_STATE          _IOR(KVMIO,  0x98, struct kvm_mp_state)
 #define KVM_SET_MP_STATE          _IOW(KVMIO,  0x99, struct kvm_mp_state)
 /* Available with KVM_CAP_NMI */
-#define KVM_NMI                   _IO(KVMIO,  0x9a)
+#define KVM_NMI                   _IO(KVMIO,   0x9a)
 /* Available with KVM_CAP_SET_GUEST_DEBUG */
 #define KVM_SET_GUEST_DEBUG       _IOW(KVMIO,  0x9b, struct kvm_guest_debug)
 /* MCE for x86 */
 #define KVM_X86_SETUP_MCE         _IOW(KVMIO,  0x9c, __u64)
 #define KVM_X86_GET_MCE_CAP_SUPPORTED _IOR(KVMIO,  0x9d, __u64)
 #define KVM_X86_SET_MCE           _IOW(KVMIO,  0x9e, struct kvm_x86_mce)
+/* IA64 stack access */
-/*
- * Deprecated interfaces
- */
-struct kvm_breakpoint {
-        __u32 enabled;
-        __u32 padding;
-        __u64 address;
-};
-struct kvm_debug_guest {
-        __u32 enabled;
-        __u32 pad;
-        struct kvm_breakpoint breakpoints[4];
-        __u32 singlestep;
-};
-#define __KVM_DEPRECATED_DEBUG_GUEST _IOW(KVMIO,  0x87, struct kvm_debug_guest)
 #define KVM_IA64_VCPU_GET_STACK   _IOR(KVMIO,  0x9a, void *)
 #define KVM_IA64_VCPU_SET_STACK   _IOW(KVMIO,  0x9b, void *)
+/* Available with KVM_CAP_VCPU_EVENTS */
-#define KVM_GET_PIT2   _IOR(KVMIO,   0x9f, struct kvm_pit_state2)
+#define KVM_GET_VCPU_EVENTS       _IOR(KVMIO,  0x9f, struct kvm_vcpu_events)
-#define KVM_SET_PIT2   _IOW(KVMIO,   0xa0, struct kvm_pit_state2)
+#define KVM_SET_VCPU_EVENTS       _IOW(KVMIO,  0xa0, struct kvm_vcpu_events)
-#define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
-#define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
-#define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)
-#define KVM_TRC_IO_READ          (KVM_TRC_HANDLER + 0x05)
-#define KVM_TRC_IO_WRITE         (KVM_TRC_HANDLER + 0x06)
-#define KVM_TRC_CR_READ          (KVM_TRC_HANDLER + 0x07)
-#define KVM_TRC_CR_WRITE         (KVM_TRC_HANDLER + 0x08)
-#define KVM_TRC_DR_READ          (KVM_TRC_HANDLER + 0x09)
-#define KVM_TRC_DR_WRITE         (KVM_TRC_HANDLER + 0x0A)
-#define KVM_TRC_MSR_READ         (KVM_TRC_HANDLER + 0x0B)
-#define KVM_TRC_MSR_WRITE        (KVM_TRC_HANDLER + 0x0C)
-#define KVM_TRC_CPUID            (KVM_TRC_HANDLER + 0x0D)
-#define KVM_TRC_INTR             (KVM_TRC_HANDLER + 0x0E)
-#define KVM_TRC_NMI              (KVM_TRC_HANDLER + 0x0F)
-#define KVM_TRC_VMMCALL          (KVM_TRC_HANDLER + 0x10)
-#define KVM_TRC_HLT              (KVM_TRC_HANDLER + 0x11)
-#define KVM_TRC_CLTS             (KVM_TRC_HANDLER + 0x12)
-#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)
-#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)
-#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)
-#define KVM_TRC_GTLB_WRITE       (KVM_TRC_HANDLER + 0x16)
-#define KVM_TRC_STLB_WRITE       (KVM_TRC_HANDLER + 0x17)
-#define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)
-#define KVM_TRC_PPC_INSTR        (KVM_TRC_HANDLER + 0x19)
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
@@ -696,4 +736,4 @@ struct kvm_assigned_msix_entry {
        __u16 padding[3];
 };
-#endif
+#endif /* __LINUX_KVM_H */
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index b7bbb5ddd7ae..bd5a616d9373 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -120,7 +120,7 @@ struct kvm_kernel_irq_routing_entry {
        u32 gsi;
        u32 type;
        int (*set)(struct kvm_kernel_irq_routing_entry *e,
-                    struct kvm *kvm, int level);
+                   struct kvm *kvm, int irq_source_id, int level);
        union {
                struct {
                        unsigned irqchip;
@@ -128,9 +128,28 @@ struct kvm_kernel_irq_routing_entry {
                } irqchip;
                struct msi_msg msi;
        };
-        struct list_head link;
+        struct hlist_node link;
+};
+#ifdef __KVM_HAVE_IOAPIC
+struct kvm_irq_routing_table {
+        int chip[KVM_NR_IRQCHIPS][KVM_IOAPIC_NUM_PINS];
+        struct kvm_kernel_irq_routing_entry *rt_entries;
+        u32 nr_rt_entries;
+        /*
+         * Array indexed by gsi. Each entry contains list of irq chips
+         * the gsi is connected to.
+         */
+        struct hlist_head map[0];
 };
+#else
+struct kvm_irq_routing_table {};
+#endif
 struct kvm {
        spinlock_t mmu_lock;
        spinlock_t requests_lock;
@@ -166,8 +185,9 @@ struct kvm {
        struct mutex irq_lock;
 #ifdef CONFIG_HAVE_KVM_IRQCHIP
-        struct list_head irq_routing; /* of kvm_kernel_irq_routing_entry */
+        struct kvm_irq_routing_table *irq_routing;
        struct hlist_head mask_notifier_list;
+        struct hlist_head irq_ack_notifier_list;
 #endif
 #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
@@ -266,6 +286,7 @@ int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
 void mark_page_dirty(struct kvm *kvm, gfn_t gfn);
 void kvm_vcpu_block(struct kvm_vcpu *vcpu);
+void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu);
 void kvm_resched(struct kvm_vcpu *vcpu);
 void kvm_load_guest_fpu(struct kvm_vcpu *vcpu);
 void kvm_put_guest_fpu(struct kvm_vcpu *vcpu);
@@ -325,7 +346,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu);
 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu);
 int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu);
-void kvm_arch_hardware_enable(void *garbage);
+int kvm_arch_hardware_enable(void *garbage);
 void kvm_arch_hardware_disable(void *garbage);
 int kvm_arch_hardware_setup(void);
 void kvm_arch_hardware_unsetup(void);
@@ -390,7 +411,12 @@ void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
                                      struct kvm_irq_mask_notifier *kimn);
 void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
-int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
+#ifdef __KVM_HAVE_IOAPIC
+void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
+                                   union kvm_ioapic_redirect_entry *entry,
+                                   unsigned long *deliver_bitmask);
+#endif
+int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
                                   struct kvm_irq_ack_notifier *kian);
@@ -552,4 +578,21 @@ static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)
        return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id;
 }
 #endif
+#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
+long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
+                                  unsigned long arg);
+#else
+static inline long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
+                                                unsigned long arg)
+{
+        return -ENOTTY;
+}
 #endif
+#endif
diff --git a/include/linux/mfd/twl4030-codec.h b/include/linux/mfd/twl4030-codec.h
new file mode 100644
index 000000000000..2ec317c68e59
--- /dev/null
+++ b/include/linux/mfd/twl4030-codec.h
@@ -0,0 +1,272 @@
+/*
+ * MFD driver for twl4030 codec submodule
+ *
+ * Author:      Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ *
+ * Copyright:   (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+#ifndef __TWL4030_CODEC_H__
+#define __TWL4030_CODEC_H__
+/* Codec registers */
+#define TWL4030_REG_CODEC_MODE          0x01
+#define TWL4030_REG_OPTION              0x02
+#define TWL4030_REG_UNKNOWN             0x03
+#define TWL4030_REG_MICBIAS_CTL         0x04
+#define TWL4030_REG_ANAMICL             0x05
+#define TWL4030_REG_ANAMICR             0x06
+#define TWL4030_REG_AVADC_CTL           0x07
+#define TWL4030_REG_ADCMICSEL           0x08
+#define TWL4030_REG_DIGMIXING           0x09
+#define TWL4030_REG_ATXL1PGA            0x0A
+#define TWL4030_REG_ATXR1PGA            0x0B
+#define TWL4030_REG_AVTXL2PGA           0x0C
+#define TWL4030_REG_AVTXR2PGA           0x0D
+#define TWL4030_REG_AUDIO_IF            0x0E
+#define TWL4030_REG_VOICE_IF            0x0F
+#define TWL4030_REG_ARXR1PGA            0x10
+#define TWL4030_REG_ARXL1PGA            0x11
+#define TWL4030_REG_ARXR2PGA            0x12
+#define TWL4030_REG_ARXL2PGA            0x13
+#define TWL4030_REG_VRXPGA              0x14
+#define TWL4030_REG_VSTPGA              0x15
+#define TWL4030_REG_VRX2ARXPGA          0x16
+#define TWL4030_REG_AVDAC_CTL           0x17
+#define TWL4030_REG_ARX2VTXPGA          0x18
+#define TWL4030_REG_ARXL1_APGA_CTL      0x19
+#define TWL4030_REG_ARXR1_APGA_CTL      0x1A
+#define TWL4030_REG_ARXL2_APGA_CTL      0x1B
+#define TWL4030_REG_ARXR2_APGA_CTL      0x1C
+#define TWL4030_REG_ATX2ARXPGA          0x1D
+#define TWL4030_REG_BT_IF               0x1E
+#define TWL4030_REG_BTPGA               0x1F
+#define TWL4030_REG_BTSTPGA             0x20
+#define TWL4030_REG_EAR_CTL             0x21
+#define TWL4030_REG_HS_SEL              0x22
+#define TWL4030_REG_HS_GAIN_SET         0x23
+#define TWL4030_REG_HS_POPN_SET         0x24
+#define TWL4030_REG_PREDL_CTL           0x25
+#define TWL4030_REG_PREDR_CTL           0x26
+#define TWL4030_REG_PRECKL_CTL          0x27
+#define TWL4030_REG_PRECKR_CTL          0x28
+#define TWL4030_REG_HFL_CTL             0x29
+#define TWL4030_REG_HFR_CTL             0x2A
+#define TWL4030_REG_ALC_CTL             0x2B
+#define TWL4030_REG_ALC_SET1            0x2C
+#define TWL4030_REG_ALC_SET2            0x2D
+#define TWL4030_REG_BOOST_CTL           0x2E
+#define TWL4030_REG_SOFTVOL_CTL         0x2F
+#define TWL4030_REG_DTMF_FREQSEL        0x30
+#define TWL4030_REG_DTMF_TONEXT1H       0x31
+#define TWL4030_REG_DTMF_TONEXT1L       0x32
+#define TWL4030_REG_DTMF_TONEXT2H       0x33
+#define TWL4030_REG_DTMF_TONEXT2L       0x34
+#define TWL4030_REG_DTMF_TONOFF         0x35
+#define TWL4030_REG_DTMF_WANONOFF       0x36
+#define TWL4030_REG_I2S_RX_SCRAMBLE_H   0x37
+#define TWL4030_REG_I2S_RX_SCRAMBLE_M   0x38
+#define TWL4030_REG_I2S_RX_SCRAMBLE_L   0x39
+#define TWL4030_REG_APLL_CTL            0x3A
+#define TWL4030_REG_DTMF_CTL            0x3B
+#define TWL4030_REG_DTMF_PGA_CTL2       0x3C
+#define TWL4030_REG_DTMF_PGA_CTL1       0x3D
+#define TWL4030_REG_MISC_SET_1          0x3E
+#define TWL4030_REG_PCMBTMUX            0x3F
+#define TWL4030_REG_RX_PATH_SEL         0x43
+#define TWL4030_REG_VDL_APGA_CTL        0x44
+#define TWL4030_REG_VIBRA_CTL           0x45
+#define TWL4030_REG_VIBRA_SET           0x46
+#define TWL4030_REG_VIBRA_PWM_SET       0x47
+#define TWL4030_REG_ANAMIC_GAIN         0x48
+#define TWL4030_REG_MISC_SET_2          0x49
+/* Bitfield Definitions */
+/* TWL4030_CODEC_MODE (0x01) Fields */
+#define TWL4030_APLL_RATE               0xF0
+#define TWL4030_APLL_RATE_8000          0x00
+#define TWL4030_APLL_RATE_11025         0x10
+#define TWL4030_APLL_RATE_12000         0x20
+#define TWL4030_APLL_RATE_16000         0x40
+#define TWL4030_APLL_RATE_22050         0x50
+#define TWL4030_APLL_RATE_24000         0x60
+#define TWL4030_APLL_RATE_32000         0x80
+#define TWL4030_APLL_RATE_44100         0x90
+#define TWL4030_APLL_RATE_48000         0xA0
+#define TWL4030_APLL_RATE_96000         0xE0
+#define TWL4030_SEL_16K                 0x08
+#define TWL4030_CODECPDZ                0x02
+#define TWL4030_OPT_MODE                0x01
+#define TWL4030_OPTION_1                (1 << 0)
+#define TWL4030_OPTION_2                (0 << 0)
+/* TWL4030_OPTION (0x02) Fields */
+#define TWL4030_ATXL1_EN                (1 << 0)
+#define TWL4030_ATXR1_EN                (1 << 1)
+#define TWL4030_ATXL2_VTXL_EN           (1 << 2)
+#define TWL4030_ATXR2_VTXR_EN           (1 << 3)
+#define TWL4030_ARXL1_VRX_EN            (1 << 4)
+#define TWL4030_ARXR1_EN                (1 << 5)
+#define TWL4030_ARXL2_EN                (1 << 6)
+#define TWL4030_ARXR2_EN                (1 << 7)
+/* TWL4030_REG_MICBIAS_CTL (0x04) Fields */
+#define TWL4030_MICBIAS2_CTL            0x40
+#define TWL4030_MICBIAS1_CTL            0x20
+#define TWL4030_HSMICBIAS_EN            0x04
+#define TWL4030_MICBIAS2_EN             0x02
+#define TWL4030_MICBIAS1_EN             0x01
+/* ANAMICL (0x05) Fields */
+#define TWL4030_CNCL_OFFSET_START       0x80
+#define TWL4030_OFFSET_CNCL_SEL         0x60
+#define TWL4030_OFFSET_CNCL_SEL_ARX1    0x00
+#define TWL4030_OFFSET_CNCL_SEL_ARX2    0x20
+#define TWL4030_OFFSET_CNCL_SEL_VRX     0x40
+#define TWL4030_OFFSET_CNCL_SEL_ALL     0x60
+#define TWL4030_MICAMPL_EN              0x10
+#define TWL4030_CKMIC_EN                0x08
+#define TWL4030_AUXL_EN                 0x04
+#define TWL4030_HSMIC_EN                0x02
+#define TWL4030_MAINMIC_EN              0x01
+/* ANAMICR (0x06) Fields */
+#define TWL4030_MICAMPR_EN              0x10
+#define TWL4030_AUXR_EN                 0x04
+#define TWL4030_SUBMIC_EN               0x01
+/* AVADC_CTL (0x07) Fields */
+#define TWL4030_ADCL_EN                 0x08
+#define TWL4030_AVADC_CLK_PRIORITY      0x04
+#define TWL4030_ADCR_EN                 0x02
+/* TWL4030_REG_ADCMICSEL (0x08) Fields */
+#define TWL4030_DIGMIC1_EN              0x08
+#define TWL4030_TX2IN_SEL               0x04
+#define TWL4030_DIGMIC0_EN              0x02
+#define TWL4030_TX1IN_SEL               0x01
+/* AUDIO_IF (0x0E) Fields */
+#define TWL4030_AIF_SLAVE_EN            0x80
+#define TWL4030_DATA_WIDTH              0x60
+#define TWL4030_DATA_WIDTH_16S_16W      0x00
+#define TWL4030_DATA_WIDTH_32S_16W      0x40
+#define TWL4030_DATA_WIDTH_32S_24W      0x60
+#define TWL4030_AIF_FORMAT              0x18
+#define TWL4030_AIF_FORMAT_CODEC        0x00
+#define TWL4030_AIF_FORMAT_LEFT         0x08
+#define TWL4030_AIF_FORMAT_RIGHT        0x10
+#define TWL4030_AIF_FORMAT_TDM          0x18
+#define TWL4030_AIF_TRI_EN              0x04
+#define TWL4030_CLK256FS_EN             0x02
+#define TWL4030_AIF_EN                  0x01
+/* VOICE_IF (0x0F) Fields */
+#define TWL4030_VIF_SLAVE_EN            0x80
+#define TWL4030_VIF_DIN_EN              0x40
+#define TWL4030_VIF_DOUT_EN             0x20
+#define TWL4030_VIF_SWAP                0x10
+#define TWL4030_VIF_FORMAT              0x08
+#define TWL4030_VIF_TRI_EN              0x04
+#define TWL4030_VIF_SUB_EN              0x02
+#define TWL4030_VIF_EN                  0x01
+/* EAR_CTL (0x21) */
+#define TWL4030_EAR_GAIN                0x30
+/* HS_GAIN_SET (0x23) Fields */
+#define TWL4030_HSR_GAIN                0x0C
+#define TWL4030_HSR_GAIN_PWR_DOWN       0x00
+#define TWL4030_HSR_GAIN_PLUS_6DB       0x04
+#define TWL4030_HSR_GAIN_0DB            0x08
+#define TWL4030_HSR_GAIN_MINUS_6DB      0x0C
+#define TWL4030_HSL_GAIN                0x03
+#define TWL4030_HSL_GAIN_PWR_DOWN       0x00
+#define TWL4030_HSL_GAIN_PLUS_6DB       0x01
+#define TWL4030_HSL_GAIN_0DB            0x02
+#define TWL4030_HSL_GAIN_MINUS_6DB      0x03
+/* HS_POPN_SET (0x24) Fields */
+#define TWL4030_VMID_EN                 0x40
+#define TWL4030_EXTMUTE                 0x20
+#define TWL4030_RAMP_DELAY              0x1C
+#define TWL4030_RAMP_DELAY_20MS         0x00
+#define TWL4030_RAMP_DELAY_40MS         0x04
+#define TWL4030_RAMP_DELAY_81MS         0x08
+#define TWL4030_RAMP_DELAY_161MS        0x0C
+#define TWL4030_RAMP_DELAY_323MS        0x10
+#define TWL4030_RAMP_DELAY_645MS        0x14
+#define TWL4030_RAMP_DELAY_1291MS       0x18
+#define TWL4030_RAMP_DELAY_2581MS       0x1C
+#define TWL4030_RAMP_EN                 0x02
+/* PREDL_CTL (0x25) */
+#define TWL4030_PREDL_GAIN              0x30
+/* PREDR_CTL (0x26) */
+#define TWL4030_PREDR_GAIN              0x30
+/* PRECKL_CTL (0x27) */
+#define TWL4030_PRECKL_GAIN             0x30
+/* PRECKR_CTL (0x28) */
+#define TWL4030_PRECKR_GAIN             0x30
+/* HFL_CTL (0x29, 0x2A) Fields */
+#define TWL4030_HF_CTL_HB_EN            0x04
+#define TWL4030_HF_CTL_LOOP_EN          0x08
+#define TWL4030_HF_CTL_RAMP_EN          0x10
+#define TWL4030_HF_CTL_REF_EN           0x20
+/* APLL_CTL (0x3A) Fields */
+#define TWL4030_APLL_EN                 0x10
+#define TWL4030_APLL_INFREQ             0x0F
+#define TWL4030_APLL_INFREQ_19200KHZ    0x05
+#define TWL4030_APLL_INFREQ_26000KHZ    0x06
+#define TWL4030_APLL_INFREQ_38400KHZ    0x0F
+/* REG_MISC_SET_1 (0x3E) Fields */
+#define TWL4030_CLK64_EN                0x80
+#define TWL4030_SCRAMBLE_EN             0x40
+#define TWL4030_FMLOOP_EN               0x20
+#define TWL4030_SMOOTH_ANAVOL_EN        0x02
+#define TWL4030_DIGMIC_LR_SWAP_EN       0x01
+/* VIBRA_CTL (0x45) */
+#define TWL4030_VIBRA_EN                0x01
+#define TWL4030_VIBRA_DIR               0x02
+#define TWL4030_VIBRA_AUDIO_SEL_L1      (0x00 << 2)
+#define TWL4030_VIBRA_AUDIO_SEL_R1      (0x01 << 2)
+#define TWL4030_VIBRA_AUDIO_SEL_L2      (0x02 << 2)
+#define TWL4030_VIBRA_AUDIO_SEL_R2      (0x03 << 2)
+#define TWL4030_VIBRA_SEL               0x10
+#define TWL4030_VIBRA_DIR_SEL           0x20
+/* TWL4030 codec resource IDs */
+enum twl4030_codec_res {
+        TWL4030_CODEC_RES_POWER = 0,
+        TWL4030_CODEC_RES_APLL,
+        TWL4030_CODEC_RES_MAX,
+};
+int twl4030_codec_disable_resource(enum twl4030_codec_res id);
+int twl4030_codec_enable_resource(enum twl4030_codec_res id);
+unsigned int twl4030_codec_get_mclk(void);
+#endif  /* End of __TWL4030_CODEC_H__ */
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 2dbfb5a05994..33b2ea09a4ad 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -28,6 +28,7 @@
 #define SDIO_DEVICE_ID_INTEL_IWMC3200TOP        0x1404
 #define SDIO_DEVICE_ID_INTEL_IWMC3200GPS        0x1405
 #define SDIO_DEVICE_ID_INTEL_IWMC3200BT         0x1406
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5  0x1407
 #define SDIO_VENDOR_ID_MARVELL                  0x02df
 #define SDIO_DEVICE_ID_MARVELL_LIBERTAS         0x9103
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 08bc776d05e2..c5f3d53548e2 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -59,20 +59,24 @@ struct vifctl {
        unsigned char vifc_flags;       /* VIFF_ flags */
        unsigned char vifc_threshold;   /* ttl limit */
        unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
-        struct in_addr vifc_lcl_addr;   /* Our address */
+        union {
+                struct in_addr vifc_lcl_addr;     /* Local interface address */
+                int            vifc_lcl_ifindex;  /* Local interface index   */
+        };
        struct in_addr vifc_rmt_addr;   /* IPIP tunnel addr */
 };
-#define VIFF_TUNNEL     0x1     /* IPIP tunnel */
+#define VIFF_TUNNEL             0x1     /* IPIP tunnel */
-#define VIFF_SRCRT      0x2     /* NI */
+#define VIFF_SRCRT              0x2     /* NI */
-#define VIFF_REGISTER   0x4     /* register vif */
+#define VIFF_REGISTER           0x4     /* register vif */
+#define VIFF_USE_IFINDEX        0x8     /* use vifc_lcl_ifindex instead of
+                                           vifc_lcl_addr to find an interface */
 /*
 *      Cache manipulation structures for mrouted and PIMd
 */
 
-struct mfcctl
+struct mfcctl {
-{
        struct in_addr mfcc_origin;             /* Origin of mcast      */
        struct in_addr mfcc_mcastgrp;           /* Group in question    */
        vifi_t  mfcc_parent;                    /* Where it arrived     */
@@ -87,8 +91,7 @@ struct mfcctl
 *      Group count retrieval for mrouted
 */
 
-struct sioc_sg_req
+struct sioc_sg_req {
-{
        struct in_addr src;
        struct in_addr grp;
        unsigned long pktcnt;
@@ -100,8 +103,7 @@ struct sioc_sg_req
 *      To get vif packet counts
 */
-struct sioc_vif_req
+struct sioc_vif_req {
-{
        vifi_t  vifi;           /* Which iface */
        unsigned long icount;   /* In packets */
        unsigned long ocount;   /* Out packets */
@@ -114,8 +116,7 @@ struct sioc_vif_req
 *      data. Magically happens to be like an IP packet as per the original
 */
 
-struct igmpmsg
+struct igmpmsg {
-{
        __u32 unused1,unused2;
        unsigned char im_msgtype;               /* What is this */
        unsigned char im_mbz;                   /* Must be zero */
@@ -176,8 +177,7 @@ static inline int ip_mr_init(void)
 }
 #endif
-struct vif_device
+struct vif_device {
-{
        struct net_device       *dev;                   /* Device we are using */
        unsigned long   bytes_in,bytes_out;
        unsigned long   pkt_in,pkt_out;         /* Statistics                   */
@@ -190,8 +190,7 @@ struct vif_device
 #define VIFF_STATIC 0x8000
-struct mfc_cache 
+struct mfc_cache {
-{
        struct mfc_cache *next;                 /* Next entry on cache line     */
 #ifdef CONFIG_NET_NS
        struct net *mfc_net;
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index b191865a6ca3..2caa1a8e525d 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -75,8 +75,7 @@ struct mif6ctl {
 *      Cache manipulation structures for mrouted and PIMd
 */
-struct mf6cctl
+struct mf6cctl {
-{
        struct sockaddr_in6 mf6cc_origin;               /* Origin of mcast      */
        struct sockaddr_in6 mf6cc_mcastgrp;             /* Group in question    */
        mifi_t  mf6cc_parent;                   /* Where it arrived     */
@@ -87,8 +86,7 @@ struct mf6cctl
 *      Group count retrieval for pim6sd
 */
-struct sioc_sg_req6
+struct sioc_sg_req6 {
-{
        struct sockaddr_in6 src;
        struct sockaddr_in6 grp;
        unsigned long pktcnt;
@@ -100,8 +98,7 @@ struct sioc_sg_req6
 *      To get vif packet counts
 */
-struct sioc_mif_req6
+struct sioc_mif_req6 {
-{
        mifi_t  mifi;           /* Which iface */
        unsigned long icount;   /* In packets */
        unsigned long ocount;   /* Out packets */
@@ -172,8 +169,7 @@ static inline void ip6_mr_cleanup(void)
 }
 #endif
-struct mif_device
+struct mif_device {
-{
        struct net_device       *dev;                   /* Device we are using */
        unsigned long   bytes_in,bytes_out;
        unsigned long   pkt_in,pkt_out;         /* Statistics                   */
@@ -185,8 +181,7 @@ struct mif_device
 #define VIFF_STATIC 0x8000
-struct mfc6_cache
+struct mfc6_cache {
-{
        struct mfc6_cache *next;                /* Next entry on cache line     */
 #ifdef CONFIG_NET_NS
        struct net *mfc6_net;
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 12c9de138451..a7003b7a695d 100644
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
-struct ndmsg
+struct ndmsg {
-{
        __u8            ndm_family;
        __u8            ndm_pad1;
        __u16           ndm_pad2;
@@ -15,8 +14,7 @@ struct ndmsg
        __u8            ndm_type;
 };
-enum
+enum {
-{
        NDA_UNSPEC,
        NDA_DST,
        NDA_LLADDR,
@@ -56,8 +54,7 @@ enum
   NUD_PERMANENT is also cannot be deleted by garbage collectors.
 */
-struct nda_cacheinfo
+struct nda_cacheinfo {
-{
        __u32           ndm_confirmed;
        __u32           ndm_used;
        __u32           ndm_updated;
@@ -89,8 +86,7 @@ struct nda_cacheinfo
 * device.
 ****/
-struct ndt_stats
+struct ndt_stats {
-{
        __u64           ndts_allocs;
        __u64           ndts_destroys;
        __u64           ndts_hash_grows;
@@ -124,15 +120,13 @@ enum {
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
-struct ndtmsg
+struct ndtmsg {
-{
        __u8            ndtm_family;
        __u8            ndtm_pad1;
        __u16           ndtm_pad2;
 };
-struct ndt_config
+struct ndt_config {
-{
        __u16           ndtc_key_len;
        __u16           ndtc_entry_size;
        __u32           ndtc_entries;
diff --git a/include/linux/net.h b/include/linux/net.h
index d7e26e30c8c2..5e8083cacc8b 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -41,6 +41,7 @@
 #define SYS_SENDMSG     16              /* sys_sendmsg(2)               */
 #define SYS_RECVMSG     17              /* sys_recvmsg(2)               */
 #define SYS_ACCEPT4     18              /* sys_accept4(2)               */
+#define SYS_RECVMMSG    19              /* sys_recvmmsg(2)              */
 typedef enum {
        SS_FREE = 0,                    /* not allocated                */
@@ -198,9 +199,13 @@ struct proto_ops {
                                       struct pipe_inode_info *pipe, size_t len, unsigned int flags);
 };
+#define DECLARE_SOCKADDR(type, dst, src)        \
+        type dst = ({ __sockaddr_check_size(sizeof(*dst)); (type) src; })
 struct net_proto_family {
        int             family;
-        int             (*create)(struct net *net, struct socket *sock, int protocol);
+        int             (*create)(struct net *net, struct socket *sock,
+                                  int protocol, int kern);
        struct module   *owner;
 };
@@ -263,89 +268,6 @@ extern int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);
 extern int kernel_sock_shutdown(struct socket *sock,
                                enum sock_shutdown_cmd how);
-#ifndef CONFIG_SMP
-#define SOCKOPS_WRAPPED(name) name
-#define SOCKOPS_WRAP(name, fam)
-#else
-#define SOCKOPS_WRAPPED(name) __unlocked_##name
-#define SOCKCALL_WRAP(name, call, parms, args)          \
-static int __lock_##name##_##call  parms                \
-{                                                       \
-        int ret;                                        \
-        lock_kernel();                                  \
-        ret = __unlocked_##name##_ops.call  args ;\
-        unlock_kernel();                                \
-        return ret;                                     \
-}
-#define SOCKCALL_UWRAP(name, call, parms, args)         \
-static unsigned int __lock_##name##_##call  parms       \
-{                                                       \
-        int ret;                                        \
-        lock_kernel();                                  \
-        ret = __unlocked_##name##_ops.call  args ;\
-        unlock_kernel();                                \
-        return ret;                                     \
-}
-#define SOCKOPS_WRAP(name, fam)                                 \
-SOCKCALL_WRAP(name, release, (struct socket *sock), (sock))     \
-SOCKCALL_WRAP(name, bind, (struct socket *sock, struct sockaddr *uaddr, int addr_len), \
-              (sock, uaddr, addr_len))                          \
-SOCKCALL_WRAP(name, connect, (struct socket *sock, struct sockaddr * uaddr, \
-                              int addr_len, int flags),         \
-              (sock, uaddr, addr_len, flags))                   \
-SOCKCALL_WRAP(name, socketpair, (struct socket *sock1, struct socket *sock2), \
-              (sock1, sock2))                                   \
-SOCKCALL_WRAP(name, accept, (struct socket *sock, struct socket *newsock, \
-                         int flags), (sock, newsock, flags)) \
-SOCKCALL_WRAP(name, getname, (struct socket *sock, struct sockaddr *uaddr, \
-                         int *addr_len, int peer), (sock, uaddr, addr_len, peer)) \
-SOCKCALL_UWRAP(name, poll, (struct file *file, struct socket *sock, struct poll_table_struct *wait), \
-              (file, sock, wait)) \
-SOCKCALL_WRAP(name, ioctl, (struct socket *sock, unsigned int cmd, \
-                         unsigned long arg), (sock, cmd, arg)) \
-SOCKCALL_WRAP(name, compat_ioctl, (struct socket *sock, unsigned int cmd, \
-                         unsigned long arg), (sock, cmd, arg)) \
-SOCKCALL_WRAP(name, listen, (struct socket *sock, int len), (sock, len)) \
-SOCKCALL_WRAP(name, shutdown, (struct socket *sock, int flags), (sock, flags)) \
-SOCKCALL_WRAP(name, setsockopt, (struct socket *sock, int level, int optname, \
-                         char __user *optval, unsigned int optlen), (sock, level, optname, optval, optlen)) \
-SOCKCALL_WRAP(name, getsockopt, (struct socket *sock, int level, int optname, \
-                         char __user *optval, int __user *optlen), (sock, level, optname, optval, optlen)) \
-SOCKCALL_WRAP(name, sendmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t len), \
-              (iocb, sock, m, len)) \
-SOCKCALL_WRAP(name, recvmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t len, int flags), \
-              (iocb, sock, m, len, flags)) \
-SOCKCALL_WRAP(name, mmap, (struct file *file, struct socket *sock, struct vm_area_struct *vma), \
-              (file, sock, vma)) \
-              \
-static const struct proto_ops name##_ops = {                    \
-        .family         = fam,                          \
-        .owner          = THIS_MODULE,                  \
-        .release        = __lock_##name##_release,      \
-        .bind           = __lock_##name##_bind,         \
-        .connect        = __lock_##name##_connect,      \
-        .socketpair     = __lock_##name##_socketpair,   \
-        .accept         = __lock_##name##_accept,       \
-        .getname        = __lock_##name##_getname,      \
-        .poll           = __lock_##name##_poll,         \
-        .ioctl          = __lock_##name##_ioctl,        \
-        .compat_ioctl   = __lock_##name##_compat_ioctl, \
-        .listen         = __lock_##name##_listen,       \
-        .shutdown       = __lock_##name##_shutdown,     \
-        .setsockopt     = __lock_##name##_setsockopt,   \
-        .getsockopt     = __lock_##name##_getsockopt,   \
-        .sendmsg        = __lock_##name##_sendmsg,      \
-        .recvmsg        = __lock_##name##_recvmsg,      \
-        .mmap           = __lock_##name##_mmap,         \
-};
-#endif
 #define MODULE_ALIAS_NETPROTO(proto) \
        MODULE_ALIAS("net-pf-" __stringify(proto))
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 812a5f3c2abe..a3fccc85b1a0 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -63,30 +63,69 @@ struct wireless_dev;
 #define HAVE_FREE_NETDEV                /* free_netdev() */
 #define HAVE_NETDEV_PRIV                /* netdev_priv() */
-#define NET_XMIT_SUCCESS        0
-#define NET_XMIT_DROP           1       /* skb dropped                  */
-#define NET_XMIT_CN             2       /* congestion notification      */
-#define NET_XMIT_POLICED        3       /* skb is shot by police        */
-#define NET_XMIT_MASK           0xFFFF  /* qdisc flags in net/sch_generic.h */
 /* Backlog congestion levels */
-#define NET_RX_SUCCESS          0   /* keep 'em coming, baby */
+#define NET_RX_SUCCESS          0       /* keep 'em coming, baby */
-#define NET_RX_DROP             1  /* packet dropped */
+#define NET_RX_DROP             1       /* packet dropped */
+/*
+ * Transmit return codes: transmit return codes originate from three different
+ * namespaces:
+ *
+ * - qdisc return codes
+ * - driver transmit return codes
+ * - errno values
+ *
+ * Drivers are allowed to return any one of those in their hard_start_xmit()
+ * function. Real network devices commonly used with qdiscs should only return
+ * the driver transmit return codes though - when qdiscs are used, the actual
+ * transmission happens asynchronously, so the value is not propagated to
+ * higher layers. Virtual network devices transmit synchronously, in this case
+ * the driver transmit return codes are consumed by dev_queue_xmit(), all
+ * others are propagated to higher layers.
+ */
+/* qdisc ->enqueue() return codes. */
+#define NET_XMIT_SUCCESS        0x00
+#define NET_XMIT_DROP           0x01    /* skb dropped                  */
+#define NET_XMIT_CN             0x02    /* congestion notification      */
+#define NET_XMIT_POLICED        0x03    /* skb is shot by police        */
+#define NET_XMIT_MASK           0x0f    /* qdisc flags in net/sch_generic.h */
 /* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
 * indicates that the device will soon be dropping packets, or already drops
 * some packets of the same priority; prompting us to send less aggressively. */
-#define net_xmit_eval(e)        ((e) == NET_XMIT_CN? 0 : (e))
+#define net_xmit_eval(e)        ((e) == NET_XMIT_CN ? 0 : (e))
 #define net_xmit_errno(e)       ((e) != NET_XMIT_CN ? -ENOBUFS : 0)
 /* Driver transmit return codes */
+#define NETDEV_TX_MASK          0xf0
 enum netdev_tx {
-        NETDEV_TX_OK = 0,       /* driver took care of packet */
+        __NETDEV_TX_MIN  = INT_MIN,     /* make sure enum is signed */
-        NETDEV_TX_BUSY,         /* driver tx path was busy*/
+        NETDEV_TX_OK     = 0x00,        /* driver took care of packet */
-        NETDEV_TX_LOCKED = -1,  /* driver tx lock was already taken */
+        NETDEV_TX_BUSY   = 0x10,        /* driver tx path was busy*/
+        NETDEV_TX_LOCKED = 0x20,        /* driver tx lock was already taken */
 };
 typedef enum netdev_tx netdev_tx_t;
+/*
+ * Current order: NETDEV_TX_MASK > NET_XMIT_MASK >= 0 is significant;
+ * hard_start_xmit() return < NET_XMIT_MASK means skb was consumed.
+ */
+static inline bool dev_xmit_complete(int rc)
+{
+        /*
+         * Positive cases with an skb consumed by a driver:
+         * - successful transmission (rc == NETDEV_TX_OK)
+         * - error while transmitting (rc < 0)
+         * - error while queueing to a different device (rc & NET_XMIT_MASK)
+         */
+        if (likely(rc < NET_XMIT_MASK))
+                return true;
+        return false;
+}
 #endif
 #define MAX_ADDR_LEN    32              /* Largest hardware address length */
@@ -125,8 +164,7 @@ typedef enum netdev_tx netdev_tx_t;
 *      with byte counters.
 */
-struct net_device_stats
+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         */
@@ -179,8 +217,7 @@ struct neighbour;
 struct neigh_parms;
 struct sk_buff;
-struct netif_rx_stats
+struct netif_rx_stats {
-{
        unsigned total;
        unsigned dropped;
        unsigned time_squeeze;
@@ -189,8 +226,7 @@ struct netif_rx_stats
 DECLARE_PER_CPU(struct netif_rx_stats, netdev_rx_stat);
-struct dev_addr_list
+struct dev_addr_list {
-{
        struct dev_addr_list    *next;
        u8                      da_addr[MAX_ADDR_LEN];
        u8                      da_addrlen;
@@ -227,8 +263,7 @@ struct netdev_hw_addr_list {
        int                     count;
 };
-struct hh_cache
+struct hh_cache {
-{
        struct hh_cache *hh_next;       /* Next entry                        */
        atomic_t        hh_refcnt;      /* number of users                   */
 /*
@@ -291,8 +326,7 @@ struct header_ops {
 * code.
 */
-enum netdev_state_t
+enum netdev_state_t {
-{
        __LINK_STATE_START,
        __LINK_STATE_PRESENT,
        __LINK_STATE_NOCARRIER,
@@ -341,20 +375,20 @@ struct napi_struct {
        struct sk_buff          *skb;
 };
-enum
+enum {
-{
        NAPI_STATE_SCHED,       /* Poll is scheduled */
        NAPI_STATE_DISABLE,     /* Disable pending */
        NAPI_STATE_NPSVC,       /* Netpoll - don't dequeue from poll_list */
 };
-enum {
+enum gro_result {
        GRO_MERGED,
        GRO_MERGED_FREE,
        GRO_HELD,
        GRO_NORMAL,
        GRO_DROP,
 };
+typedef enum gro_result gro_result_t;
 extern void __napi_schedule(struct napi_struct *n);
@@ -457,8 +491,7 @@ static inline void napi_synchronize(const struct napi_struct *n)
 # define napi_synchronize(n)    barrier()
 #endif
-enum netdev_queue_state_t
+enum netdev_queue_state_t {
-{
        __QUEUE_STATE_XOFF,
        __QUEUE_STATE_FROZEN,
 };
@@ -635,6 +668,10 @@ struct net_device_ops {
                                                      unsigned int sgc);
        int                     (*ndo_fcoe_ddp_done)(struct net_device *dev,
                                                     u16 xid);
+#define NETDEV_FCOE_WWNN 0
+#define NETDEV_FCOE_WWPN 1
+        int                     (*ndo_fcoe_get_wwn)(struct net_device *dev,
+                                                    u64 *wwn, int type);
 #endif
 };
@@ -648,8 +685,7 @@ struct net_device_ops {
 *      moves out.
 */
-struct net_device
+struct net_device {
-{
        /*
         * This is the first field of the "visible" part of this structure
@@ -683,6 +719,7 @@ struct net_device
        struct list_head        dev_list;
        struct list_head        napi_list;
+        struct list_head        unreg_list;
        /* Net device features */
        unsigned long           features;
@@ -859,7 +896,7 @@ struct net_device
        /* device index hash chain */
        struct hlist_node       index_hlist;
-        struct net_device       *link_watch_next;
+        struct list_head        link_watch_list;
        /* register/unregister state machine */
        enum { NETREG_UNINITIALIZED=0,
@@ -894,8 +931,8 @@ struct net_device
        /* class/net/name entry */
        struct device           dev;
-        /* space for optional statistics and wireless sysfs groups */
+        /* space for optional device, statistics, and wireless sysfs groups */
-        const struct attribute_group *sysfs_groups[3];
+        const struct attribute_group *sysfs_groups[4];
        /* rtnetlink link ops */
        const struct rtnl_link_ops *rtnl_link_ops;
@@ -909,7 +946,7 @@ struct net_device
 #ifdef CONFIG_DCB
        /* Data Center Bridging netlink ops */
-        struct dcbnl_rtnl_ops *dcbnl_ops;
+        const struct dcbnl_rtnl_ops *dcbnl_ops;
 #endif
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
@@ -1075,10 +1112,16 @@ extern rwlock_t				dev_base_lock;		/* Device list lock */
 #define for_each_netdev(net, d)         \
                list_for_each_entry(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_reverse(net, d) \
+                list_for_each_entry_reverse(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_rcu(net, d)             \
+                list_for_each_entry_rcu(d, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_safe(net, d, n) \
                list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_continue(net, d)                \
                list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_continue_rcu(net, d)            \
+        list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list)
 #define net_device_entry(lh)    list_entry(lh, struct net_device, dev_list)
 static inline struct net_device *next_net_device(struct net_device *dev)
@@ -1091,6 +1134,16 @@ static inline struct net_device *next_net_device(struct net_device *dev)
        return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
 }
+static inline struct net_device *next_net_device_rcu(struct net_device *dev)
+{
+        struct list_head *lh;
+        struct net *net;
+        net = dev_net(dev);
+        lh = rcu_dereference(dev->dev_list.next);
+        return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
+}
 static inline struct net_device *first_net_device(struct net *net)
 {
        return list_empty(&net->dev_base_head) ? NULL :
@@ -1109,6 +1162,7 @@ extern void		__dev_remove_pack(struct packet_type *pt);
 extern struct net_device        *dev_get_by_flags(struct net *net, unsigned short flags,
                                                  unsigned short mask);
 extern struct net_device        *dev_get_by_name(struct net *net, const char *name);
+extern struct net_device        *dev_get_by_name_rcu(struct net *net, const char *name);
 extern struct net_device        *__dev_get_by_name(struct net *net, const char *name);
 extern int              dev_alloc_name(struct net_device *dev, const char *name);
 extern int              dev_open(struct net_device *dev);
@@ -1116,7 +1170,14 @@ extern int		dev_close(struct net_device *dev);
 extern void             dev_disable_lro(struct net_device *dev);
 extern int              dev_queue_xmit(struct sk_buff *skb);
 extern int              register_netdevice(struct net_device *dev);
-extern void             unregister_netdevice(struct net_device *dev);
+extern void             unregister_netdevice_queue(struct net_device *dev,
+                                                   struct list_head *head);
+extern void             unregister_netdevice_many(struct list_head *head);
+static inline void unregister_netdevice(struct net_device *dev)
+{
+        unregister_netdevice_queue(dev, NULL);
+}
 extern void             free_netdev(struct net_device *dev);
 extern void             synchronize_net(void);
 extern int              register_netdevice_notifier(struct notifier_block *nb);
@@ -1127,6 +1188,7 @@ extern void		netdev_resync_ops(struct net_device *dev);
 extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
 extern struct net_device        *dev_get_by_index(struct net *net, int ifindex);
 extern struct net_device        *__dev_get_by_index(struct net *net, int ifindex);
+extern struct net_device        *dev_get_by_index_rcu(struct net *net, int ifindex);
 extern int              dev_restart(struct net_device *dev);
 #ifdef CONFIG_NETPOLL_TRAP
 extern int              netpoll_trap(void);
@@ -1212,8 +1274,7 @@ static inline int unregister_gifconf(unsigned int family)
 * Incoming packets are placed on per-cpu queues so that
 * no locking is needed.
 */
-struct softnet_data
+struct softnet_data {
-{
        struct Qdisc            *output_queue;
        struct sk_buff_head     input_pkt_queue;
        struct list_head        poll_list;
@@ -1467,18 +1528,19 @@ extern int		netif_rx_ni(struct sk_buff *skb);
 #define HAVE_NETIF_RECEIVE_SKB 1
 extern int              netif_receive_skb(struct sk_buff *skb);
 extern void             napi_gro_flush(struct napi_struct *napi);
-extern int              dev_gro_receive(struct napi_struct *napi,
+extern gro_result_t     dev_gro_receive(struct napi_struct *napi,
                                        struct sk_buff *skb);
-extern int              napi_skb_finish(int ret, struct sk_buff *skb);
+extern gro_result_t     napi_skb_finish(gro_result_t ret, struct sk_buff *skb);
-extern int              napi_gro_receive(struct napi_struct *napi,
+extern gro_result_t     napi_gro_receive(struct napi_struct *napi,
                                         struct sk_buff *skb);
 extern void             napi_reuse_skb(struct napi_struct *napi,
                                       struct sk_buff *skb);
 extern struct sk_buff * napi_get_frags(struct napi_struct *napi);
-extern int              napi_frags_finish(struct napi_struct *napi,
+extern gro_result_t     napi_frags_finish(struct napi_struct *napi,
-                                          struct sk_buff *skb, int ret);
+                                          struct sk_buff *skb,
+                                          gro_result_t ret);
 extern struct sk_buff * napi_frags_skb(struct napi_struct *napi);
-extern int              napi_gro_frags(struct napi_struct *napi);
+extern gro_result_t     napi_gro_frags(struct napi_struct *napi);
 static inline void napi_free_frags(struct napi_struct *napi)
 {
@@ -1502,6 +1564,8 @@ extern int		dev_set_mac_address(struct net_device *,
 extern int              dev_hard_start_xmit(struct sk_buff *skb,
                                            struct net_device *dev,
                                            struct netdev_queue *txq);
+extern int              dev_forward_skb(struct net_device *dev,
+                                        struct sk_buff *skb);
 extern int              netdev_budget;
@@ -1540,6 +1604,7 @@ static inline void dev_hold(struct net_device *dev)
 */
 extern void linkwatch_fire_event(struct net_device *dev);
+extern void linkwatch_forget_dev(struct net_device *dev);
 /**
 *      netif_carrier_ok - test if carrier present
@@ -1609,7 +1674,8 @@ static inline int netif_dormant(const struct net_device *dev)
 *
 * Check if carrier is operational
 */
-static inline int netif_oper_up(const struct net_device *dev) {
+static inline int netif_oper_up(const struct net_device *dev)
+{
        return (dev->operstate == IF_OPER_UP ||
                dev->operstate == IF_OPER_UNKNOWN /* backward compat */);
 }
@@ -1880,6 +1946,7 @@ extern void		netdev_features_change(struct net_device *dev);
 extern void             dev_load(struct net *net, const char *name);
 extern void             dev_mcast_init(void);
 extern const struct net_device_stats *dev_get_stats(struct net_device *dev);
+extern void             dev_txq_stats_fold(const struct net_device *dev, struct net_device_stats *stats);
 extern int              netdev_max_backlog;
 extern int              weight_p;
@@ -1914,6 +1981,9 @@ unsigned long netdev_increment_features(unsigned long all, unsigned long one,
                                        unsigned long mask);
 unsigned long netdev_fix_features(unsigned long features, const char *name);
+void netif_stacked_transfer_operstate(const struct net_device *rootdev,
+                                        struct net_device *dev);
 static inline int net_gso_ok(int features, int gso_type)
 {
        int feature = gso_type << NETIF_F_GSO_SHIFT;
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 6132b5e6d9d3..48c54960773c 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -93,8 +93,7 @@ typedef unsigned int nf_hookfn(unsigned int hooknum,
                               const struct net_device *out,
                               int (*okfn)(struct sk_buff *));
-struct nf_hook_ops
+struct nf_hook_ops {
-{
        struct list_head list;
        /* User fills in from here down. */
@@ -106,8 +105,7 @@ struct nf_hook_ops
        int priority;
 };
-struct nf_sockopt_ops
+struct nf_sockopt_ops {
-{
        struct list_head list;
        u_int8_t pf;
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index a8248ee422b7..a374787ed9b0 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -3,8 +3,7 @@
 /* Connection state tracking for netfilter.  This is separated from,
   but required by, the NAT layer; it can also be used by an iptables
   extension. */
-enum ip_conntrack_info
+enum ip_conntrack_info {
-{
        /* Part of an established connection (either direction). */
        IP_CT_ESTABLISHED,
@@ -76,8 +75,7 @@ enum ip_conntrack_status {
 };
 #ifdef __KERNEL__
-struct ip_conntrack_stat
+struct ip_conntrack_stat {
-{
        unsigned int searched;
        unsigned int found;
        unsigned int new;
diff --git a/include/linux/netfilter/nf_conntrack_ftp.h b/include/linux/netfilter/nf_conntrack_ftp.h
index 47727d7546ea..3e3aa08980c3 100644
--- a/include/linux/netfilter/nf_conntrack_ftp.h
+++ b/include/linux/netfilter/nf_conntrack_ftp.h
@@ -3,8 +3,7 @@
 /* FTP tracking. */
 /* This enum is exposed to userspace */
-enum nf_ct_ftp_type
+enum nf_ct_ftp_type {
-{
        /* PORT command from client */
        NF_CT_FTP_PORT,
        /* PASV response from server */
diff --git a/include/linux/netfilter/nf_conntrack_sctp.h b/include/linux/netfilter/nf_conntrack_sctp.h
index 768f78c4ac53..ceeefe6681b5 100644
--- a/include/linux/netfilter/nf_conntrack_sctp.h
+++ b/include/linux/netfilter/nf_conntrack_sctp.h
@@ -16,8 +16,7 @@ enum sctp_conntrack {
        SCTP_CONNTRACK_MAX
 };
-struct ip_ct_sctp
+struct ip_ct_sctp {
-{
        enum sctp_conntrack state;
        __be32 vtag[IP_CT_DIR_MAX];
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h
index 4352feed2377..6e135f97e59a 100644
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
@@ -55,8 +55,7 @@ struct ip_ct_tcp_state {
        u_int8_t        flags;          /* per direction options */
 };
-struct ip_ct_tcp
+struct ip_ct_tcp {
-{
        struct ip_ct_tcp_state seen[2]; /* connection parameters per direction */
        u_int8_t        state;          /* state of the connection (enum tcp_conntrack) */
        /* For detecting stale connections */
@@ -67,6 +66,9 @@ struct ip_ct_tcp
        u_int32_t       last_ack;       /* Last sequence number seen in opposite dir */
        u_int32_t       last_end;       /* Last seq + len */
        u_int16_t       last_win;       /* Last window advertisement seen in dir */
+        /* For SYN packets while we may be out-of-sync */
+        u_int8_t        last_wscale;    /* Last window scaling factor seen */
+        u_int8_t        last_flags;     /* Last flags set */
 };
 #endif /* __KERNEL__ */
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 9f00da287f2c..49d321f3ccd2 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -55,8 +55,7 @@ struct nfgenmsg {
 #include <linux/capability.h>
 #include <net/netlink.h>
-struct nfnl_callback
+struct nfnl_callback {
-{
        int (*call)(struct sock *nl, struct sk_buff *skb, 
                    const struct nlmsghdr *nlh,
                    const struct nlattr * const cda[]);
@@ -64,8 +63,7 @@ struct nfnl_callback
        const u_int16_t attr_count;             /* number of nlattr's */
 };
-struct nfnetlink_subsystem
+struct nfnetlink_subsystem {
-{
        const char *name;
        __u8 subsys_id;                 /* nfnetlink subsystem ID */
        __u8 cb_count;                  /* number of callbacks */
diff --git a/include/linux/netfilter/nfnetlink_compat.h b/include/linux/netfilter/nfnetlink_compat.h
index eda55cabceec..ffb95036bbd4 100644
--- a/include/linux/netfilter/nfnetlink_compat.h
+++ b/include/linux/netfilter/nfnetlink_compat.h
@@ -21,8 +21,7 @@
 * ! nfnetlink use the same attributes methods. - J. Schulist.
 */
-struct nfattr
+struct nfattr {
-{
        __u16 nfa_len;
        __u16 nfa_type; /* we use 15 bits for the type, and the highest
                                 * bit to indicate whether the payload is nested */
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 812cb153cabb..378f27ae7772 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -6,8 +6,7 @@
 #define XT_FUNCTION_MAXNAMELEN 30
 #define XT_TABLE_MAXNAMELEN 32
-struct xt_entry_match
+struct xt_entry_match {
-{
        union {
                struct {
                        __u16 match_size;
@@ -31,8 +30,7 @@ struct xt_entry_match
        unsigned char data[0];
 };
-struct xt_entry_target
+struct xt_entry_target {
-{
        union {
                struct {
                        __u16 target_size;
@@ -64,16 +62,14 @@ struct xt_entry_target
        },                                                                     \
 }
-struct xt_standard_target
+struct xt_standard_target {
-{
        struct xt_entry_target target;
        int verdict;
 };
 /* The argument to IPT_SO_GET_REVISION_*.  Returns highest revision
 * kernel supports, if >= revision. */
-struct xt_get_revision
+struct xt_get_revision {
-{
        char name[XT_FUNCTION_MAXNAMELEN-1];
        __u8 revision;
@@ -90,8 +86,7 @@ struct xt_get_revision
 * ip6t_entry and arpt_entry.  This sucks, and it is a hack.  It will be my
 * personal pleasure to remove it -HW
 */
-struct _xt_align
+struct _xt_align {
-{
        __u8 u8;
        __u16 u16;
        __u32 u32;
@@ -109,14 +104,12 @@ struct _xt_align
 #define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0)
 #define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0)
-struct xt_counters
+struct xt_counters {
-{
        __u64 pcnt, bcnt;                       /* Packet and byte counters */
 };
 /* The argument to IPT_SO_ADD_COUNTERS. */
-struct xt_counters_info
+struct xt_counters_info {
-{
        /* Which table. */
        char name[XT_TABLE_MAXNAMELEN];
@@ -269,8 +262,7 @@ struct xt_tgdtor_param {
        u_int8_t family;
 };
-struct xt_match
+struct xt_match {
-{
        struct list_head list;
        const char name[XT_FUNCTION_MAXNAMELEN-1];
@@ -310,8 +302,7 @@ struct xt_match
 };
 /* Registration hooks for targets. */
-struct xt_target
+struct xt_target {
-{
        struct list_head list;
        const char name[XT_FUNCTION_MAXNAMELEN-1];
@@ -349,8 +340,7 @@ struct xt_target
 };
 /* Furniture shopping... */
-struct xt_table
+struct xt_table {
-{
        struct list_head list;
        /* What hooks you will enter on */
@@ -371,8 +361,7 @@ struct xt_table
 #include <linux/netfilter_ipv4.h>
 /* The table itself */
-struct xt_table_info
+struct xt_table_info {
-{
        /* Size per table */
        unsigned int size;
        /* Number of entries: FIXME. --RR */
@@ -528,8 +517,7 @@ static inline unsigned long ifname_compare_aligned(const char *_a,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
-struct compat_xt_entry_match
+struct compat_xt_entry_match {
-{
        union {
                struct {
                        u_int16_t match_size;
@@ -545,8 +533,7 @@ struct compat_xt_entry_match
        unsigned char data[0];
 };
-struct compat_xt_entry_target
+struct compat_xt_entry_target {
-{
        union {
                struct {
                        u_int16_t target_size;
@@ -566,8 +553,7 @@ struct compat_xt_entry_target
 * need to change whole approach in order to calculate align as function of
 * current task alignment */
-struct compat_xt_counters
+struct compat_xt_counters {
-{
 #if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
        u_int32_t cnt[4];
 #else
@@ -575,8 +561,7 @@ struct compat_xt_counters
 #endif
 };
-struct compat_xt_counters_info
+struct compat_xt_counters_info {
-{
        char name[XT_TABLE_MAXNAMELEN];
        compat_uint_t num_counters;
        struct compat_xt_counters counters[0];
diff --git a/include/linux/netfilter/xt_connbytes.h b/include/linux/netfilter/xt_connbytes.h
index 52bd6153b996..92fcbb0d193e 100644
--- a/include/linux/netfilter/xt_connbytes.h
+++ b/include/linux/netfilter/xt_connbytes.h
@@ -15,8 +15,7 @@ enum xt_connbytes_direction {
        XT_CONNBYTES_DIR_BOTH,
 };
-struct xt_connbytes_info
+struct xt_connbytes_info {
-{
        struct {
                aligned_u64 from;       /* count to be matched */
                aligned_u64 to;         /* count to be matched */
diff --git a/include/linux/netfilter/xt_esp.h b/include/linux/netfilter/xt_esp.h
index ef6fa4747d0a..ee6882408000 100644
--- a/include/linux/netfilter/xt_esp.h
+++ b/include/linux/netfilter/xt_esp.h
@@ -3,8 +3,7 @@
 #include <linux/types.h>
-struct xt_esp
+struct xt_esp {
-{
        __u32 spis[2];  /* Security Parameter Index */
        __u8  invflags; /* Inverse flags */
 };
diff --git a/include/linux/netfilter/xt_multiport.h b/include/linux/netfilter/xt_multiport.h
index 185db499fcbc..5b7e72dfffc5 100644
--- a/include/linux/netfilter/xt_multiport.h
+++ b/include/linux/netfilter/xt_multiport.h
@@ -3,8 +3,7 @@
 #include <linux/types.h>
-enum xt_multiport_flags
+enum xt_multiport_flags {
-{
        XT_MULTIPORT_SOURCE,
        XT_MULTIPORT_DESTINATION,
        XT_MULTIPORT_EITHER
@@ -13,15 +12,13 @@ enum xt_multiport_flags
 #define XT_MULTI_PORTS  15
 /* Must fit inside union xt_matchinfo: 16 bytes */
-struct xt_multiport
+struct xt_multiport {
-{
        __u8 flags;                             /* Type of comparison */
        __u8 count;                             /* Number of ports */
        __u16 ports[XT_MULTI_PORTS];    /* Ports */
 };
-struct xt_multiport_v1
+struct xt_multiport_v1 {
-{
        __u8 flags;                             /* Type of comparison */
        __u8 count;                             /* Number of ports */
        __u16 ports[XT_MULTI_PORTS];    /* Ports */
diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h
index 7bb64e7c853d..be8ead05c316 100644
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/linux/netfilter/xt_policy.h
@@ -5,22 +5,19 @@
 #define XT_POLICY_MAX_ELEM      4
-enum xt_policy_flags
+enum xt_policy_flags {
-{
        XT_POLICY_MATCH_IN      = 0x1,
        XT_POLICY_MATCH_OUT     = 0x2,
        XT_POLICY_MATCH_NONE    = 0x4,
        XT_POLICY_MATCH_STRICT  = 0x8,
 };
-enum xt_policy_modes
+enum xt_policy_modes {
-{
        XT_POLICY_MODE_TRANSPORT,
        XT_POLICY_MODE_TUNNEL
 };
-struct xt_policy_spec
+struct xt_policy_spec {
-{
        __u8    saddr:1,
                        daddr:1,
                        proto:1,
@@ -30,15 +27,13 @@ struct xt_policy_spec
 };
 #ifndef __KERNEL__
-union xt_policy_addr
+union xt_policy_addr {
-{
        struct in_addr  a4;
        struct in6_addr a6;
 };
 #endif
-struct xt_policy_elem
+struct xt_policy_elem {
-{
        union {
 #ifdef __KERNEL__
                struct {
@@ -65,8 +60,7 @@ struct xt_policy_elem
        struct xt_policy_spec   invert;
 };
-struct xt_policy_info
+struct xt_policy_info {
-{
        struct xt_policy_elem pol[XT_POLICY_MAX_ELEM];
        __u16 flags;
        __u16 len;
diff --git a/include/linux/netfilter/xt_state.h b/include/linux/netfilter/xt_state.h
index c06f32edee07..7b32de886613 100644
--- a/include/linux/netfilter/xt_state.h
+++ b/include/linux/netfilter/xt_state.h
@@ -6,8 +6,7 @@
 #define XT_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 1))
-struct xt_state_info
+struct xt_state_info {
-{
        unsigned int statemask;
 };
 #endif /*_XT_STATE_H*/
diff --git a/include/linux/netfilter/xt_string.h b/include/linux/netfilter/xt_string.h
index ecbb95fc89ed..235347c02eab 100644
--- a/include/linux/netfilter/xt_string.h
+++ b/include/linux/netfilter/xt_string.h
@@ -11,8 +11,7 @@ enum {
        XT_STRING_FLAG_IGNORECASE       = 0x02
 };
-struct xt_string_info
+struct xt_string_info {
-{
        __u16 from_offset;
        __u16 to_offset;
        char      algo[XT_STRING_MAX_ALGO_NAME_SIZE];
diff --git a/include/linux/netfilter/xt_tcpudp.h b/include/linux/netfilter/xt_tcpudp.h
index a490a0bc1d29..38aa7b399021 100644
--- a/include/linux/netfilter/xt_tcpudp.h
+++ b/include/linux/netfilter/xt_tcpudp.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 /* TCP matching stuff */
-struct xt_tcp
+struct xt_tcp {
-{
        __u16 spts[2];                  /* Source port range. */
        __u16 dpts[2];                  /* Destination port range. */
        __u8 option;                    /* TCP Option iff non-zero*/
@@ -22,8 +21,7 @@ struct xt_tcp
 #define XT_TCP_INV_MASK         0x0F    /* All possible flags. */
 /* UDP matching stuff */
-struct xt_udp
+struct xt_udp {
-{
        __u16 spts[2];                  /* Source port range. */
        __u16 dpts[2];                  /* Destination port range. */
        __u8 invflags;                  /* Inverse flags */
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index 6fe3e6aa10db..f2336523a9df 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -132,8 +132,7 @@ struct arpt_entry
 #define ARPT_RETURN XT_RETURN
 /* The argument to ARPT_SO_GET_INFO */
-struct arpt_getinfo
+struct arpt_getinfo {
-{
        /* Which table: caller fills this in. */
        char name[ARPT_TABLE_MAXNAMELEN];
@@ -155,8 +154,7 @@ struct arpt_getinfo
 };
 /* The argument to ARPT_SO_SET_REPLACE. */
-struct arpt_replace
+struct arpt_replace {
-{
        /* Which table. */
        char name[ARPT_TABLE_MAXNAMELEN];
@@ -191,8 +189,7 @@ struct arpt_replace
 #define arpt_counters xt_counters
 /* The argument to ARPT_SO_GET_ENTRIES. */
-struct arpt_get_entries
+struct arpt_get_entries {
-{
        /* Which table: user fills this in. */
        char name[ARPT_TABLE_MAXNAMELEN];
@@ -224,20 +221,17 @@ static __inline__ struct arpt_entry_target *arpt_get_target(struct arpt_entry *e
 #ifdef __KERNEL__
 /* Standard entry. */
-struct arpt_standard
+struct arpt_standard {
-{
        struct arpt_entry entry;
        struct arpt_standard_target target;
 };
-struct arpt_error_target
+struct arpt_error_target {
-{
        struct arpt_entry_target target;
        char errorname[ARPT_FUNCTION_MAXNAMELEN];
 };
-struct arpt_error
+struct arpt_error {
-{
        struct arpt_entry entry;
        struct arpt_error_target target;
 };
@@ -279,8 +273,7 @@ extern unsigned int arpt_do_table(struct sk_buff *skb,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
-struct compat_arpt_entry
+struct compat_arpt_entry {
-{
        struct arpt_arp arp;
        u_int16_t target_offset;
        u_int16_t next_offset;
diff --git a/include/linux/netfilter_bridge/ebt_802_3.h b/include/linux/netfilter_bridge/ebt_802_3.h
index a11b0c2017fd..c73ef0b18bdc 100644
--- a/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/include/linux/netfilter_bridge/ebt_802_3.h
@@ -58,8 +58,7 @@ static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)
 }
 #endif
-struct ebt_802_3_info 
+struct ebt_802_3_info {
-{
        uint8_t  sap;
        __be16 type;
        uint8_t  bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_among.h b/include/linux/netfilter_bridge/ebt_among.h
index 7654069233ca..0009558609a7 100644
--- a/include/linux/netfilter_bridge/ebt_among.h
+++ b/include/linux/netfilter_bridge/ebt_among.h
@@ -29,14 +29,12 @@
 * Yes, it is a memory overhead, but in 2003 AD, who cares?
 */
-struct ebt_mac_wormhash_tuple
+struct ebt_mac_wormhash_tuple {
-{
        uint32_t cmp[2];
        __be32 ip;
 };
-struct ebt_mac_wormhash
+struct ebt_mac_wormhash {
-{
        int table[257];
        int poolsize;
        struct ebt_mac_wormhash_tuple pool[0];
@@ -45,8 +43,7 @@ struct ebt_mac_wormhash
 #define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \
                + (x)->poolsize * sizeof(struct ebt_mac_wormhash_tuple) : 0)
-struct ebt_among_info
+struct ebt_among_info {
-{
        int wh_dst_ofs;
        int wh_src_ofs;
        int bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_arpreply.h b/include/linux/netfilter_bridge/ebt_arpreply.h
index 96a8339960e0..7e77896e1fbf 100644
--- a/include/linux/netfilter_bridge/ebt_arpreply.h
+++ b/include/linux/netfilter_bridge/ebt_arpreply.h
@@ -1,8 +1,7 @@
 #ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
 #define __LINUX_BRIDGE_EBT_ARPREPLY_H
-struct ebt_arpreply_info
+struct ebt_arpreply_info {
-{
        unsigned char mac[ETH_ALEN];
        int target;
 };
diff --git a/include/linux/netfilter_bridge/ebt_ip.h b/include/linux/netfilter_bridge/ebt_ip.h
index d6847475bf2e..6a708fb92241 100644
--- a/include/linux/netfilter_bridge/ebt_ip.h
+++ b/include/linux/netfilter_bridge/ebt_ip.h
@@ -26,8 +26,7 @@
 #define EBT_IP_MATCH "ip"
 /* the same values are used for the invflags */
-struct ebt_ip_info
+struct ebt_ip_info {
-{
        __be32 saddr;
        __be32 daddr;
        __be32 smsk;
diff --git a/include/linux/netfilter_bridge/ebt_ip6.h b/include/linux/netfilter_bridge/ebt_ip6.h
index 2273c3ae33ca..e5de98701519 100644
--- a/include/linux/netfilter_bridge/ebt_ip6.h
+++ b/include/linux/netfilter_bridge/ebt_ip6.h
@@ -23,8 +23,7 @@
 #define EBT_IP6_MATCH "ip6"
 /* the same values are used for the invflags */
-struct ebt_ip6_info
+struct ebt_ip6_info {
-{
        struct in6_addr saddr;
        struct in6_addr daddr;
        struct in6_addr smsk;
diff --git a/include/linux/netfilter_bridge/ebt_limit.h b/include/linux/netfilter_bridge/ebt_limit.h
index d8b65000afe4..4bf76b751676 100644
--- a/include/linux/netfilter_bridge/ebt_limit.h
+++ b/include/linux/netfilter_bridge/ebt_limit.h
@@ -9,8 +9,7 @@
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
   seconds, or one every 59 hours. */
-struct ebt_limit_info
+struct ebt_limit_info {
-{
        u_int32_t avg;    /* Average secs between packets * scale */
        u_int32_t burst;  /* Period multiplier for upper limit. */
diff --git a/include/linux/netfilter_bridge/ebt_log.h b/include/linux/netfilter_bridge/ebt_log.h
index b76e653157e5..cc2cdfb764bc 100644
--- a/include/linux/netfilter_bridge/ebt_log.h
+++ b/include/linux/netfilter_bridge/ebt_log.h
@@ -9,8 +9,7 @@
 #define EBT_LOG_PREFIX_SIZE 30
 #define EBT_LOG_WATCHER "log"
-struct ebt_log_info
+struct ebt_log_info {
-{
        uint8_t loglevel;
        uint8_t prefix[EBT_LOG_PREFIX_SIZE];
        uint32_t bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_mark_m.h b/include/linux/netfilter_bridge/ebt_mark_m.h
index 301524ff1065..9ceb10ec0ed6 100644
--- a/include/linux/netfilter_bridge/ebt_mark_m.h
+++ b/include/linux/netfilter_bridge/ebt_mark_m.h
@@ -4,8 +4,7 @@
 #define EBT_MARK_AND 0x01
 #define EBT_MARK_OR 0x02
 #define EBT_MARK_MASK (EBT_MARK_AND | EBT_MARK_OR)
-struct ebt_mark_m_info
+struct ebt_mark_m_info {
-{
        unsigned long mark, mask;
        uint8_t invert;
        uint8_t bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_mark_t.h b/include/linux/netfilter_bridge/ebt_mark_t.h
index 6270f6f33693..7d5a268a4311 100644
--- a/include/linux/netfilter_bridge/ebt_mark_t.h
+++ b/include/linux/netfilter_bridge/ebt_mark_t.h
@@ -13,8 +13,7 @@
 #define MARK_AND_VALUE (0xffffffd0)
 #define MARK_XOR_VALUE (0xffffffc0)
-struct ebt_mark_t_info
+struct ebt_mark_t_info {
-{
        unsigned long mark;
        /* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
        int target;
diff --git a/include/linux/netfilter_bridge/ebt_nat.h b/include/linux/netfilter_bridge/ebt_nat.h
index 435b886a51aa..5e74e3b03bd6 100644
--- a/include/linux/netfilter_bridge/ebt_nat.h
+++ b/include/linux/netfilter_bridge/ebt_nat.h
@@ -2,8 +2,7 @@
 #define __LINUX_BRIDGE_EBT_NAT_H
 #define NAT_ARP_BIT  (0x00000010)
-struct ebt_nat_info
+struct ebt_nat_info {
-{
        unsigned char mac[ETH_ALEN];
        /* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
        int target;
diff --git a/include/linux/netfilter_bridge/ebt_pkttype.h b/include/linux/netfilter_bridge/ebt_pkttype.h
index 0d64bbb29c66..51a799840931 100644
--- a/include/linux/netfilter_bridge/ebt_pkttype.h
+++ b/include/linux/netfilter_bridge/ebt_pkttype.h
@@ -1,8 +1,7 @@
 #ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
 #define __LINUX_BRIDGE_EBT_PKTTYPE_H
-struct ebt_pkttype_info
+struct ebt_pkttype_info {
-{
        uint8_t pkt_type;
        uint8_t invert;
 };
diff --git a/include/linux/netfilter_bridge/ebt_redirect.h b/include/linux/netfilter_bridge/ebt_redirect.h
index 5c67990fce39..dd9622ce8488 100644
--- a/include/linux/netfilter_bridge/ebt_redirect.h
+++ b/include/linux/netfilter_bridge/ebt_redirect.h
@@ -1,8 +1,7 @@
 #ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
 #define __LINUX_BRIDGE_EBT_REDIRECT_H
-struct ebt_redirect_info
+struct ebt_redirect_info {
-{
        /* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
        int target;
 };
diff --git a/include/linux/netfilter_bridge/ebt_stp.h b/include/linux/netfilter_bridge/ebt_stp.h
index e5fd67850f4d..e503a0aa2728 100644
--- a/include/linux/netfilter_bridge/ebt_stp.h
+++ b/include/linux/netfilter_bridge/ebt_stp.h
@@ -20,8 +20,7 @@
 #define EBT_STP_MATCH "stp"
-struct ebt_stp_config_info
+struct ebt_stp_config_info {
-{
        uint8_t flags;
        uint16_t root_priol, root_priou;
        char root_addr[6], root_addrmsk[6];
@@ -35,8 +34,7 @@ struct ebt_stp_config_info
        uint16_t forward_delayl, forward_delayu;
 };
-struct ebt_stp_info
+struct ebt_stp_info {
-{
        uint8_t type;
        struct ebt_stp_config_info config;
        uint16_t bitmask;
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index ea281e6a2048..3cc40c131cc3 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -34,14 +34,12 @@
 struct xt_match;
 struct xt_target;
-struct ebt_counter
+struct ebt_counter {
-{
        uint64_t pcnt;
        uint64_t bcnt;
 };
-struct ebt_replace
+struct ebt_replace {
-{
        char name[EBT_TABLE_MAXNAMELEN];
        unsigned int valid_hooks;
        /* nr of rules in the table */
@@ -57,8 +55,7 @@ struct ebt_replace
        char __user *entries;
 };
-struct ebt_replace_kernel
+struct ebt_replace_kernel {
-{
        char name[EBT_TABLE_MAXNAMELEN];
        unsigned int valid_hooks;
        /* nr of rules in the table */
@@ -120,8 +117,7 @@ struct ebt_entries {
 #define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \
   | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST)
-struct ebt_entry_match
+struct ebt_entry_match {
-{
        union {
                char name[EBT_FUNCTION_MAXNAMELEN];
                struct xt_match *match;
@@ -131,8 +127,7 @@ struct ebt_entry_match
        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
 };
-struct ebt_entry_watcher
+struct ebt_entry_watcher {
-{
        union {
                char name[EBT_FUNCTION_MAXNAMELEN];
                struct xt_target *watcher;
@@ -142,8 +137,7 @@ struct ebt_entry_watcher
        unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
 };
-struct ebt_entry_target
+struct ebt_entry_target {
-{
        union {
                char name[EBT_FUNCTION_MAXNAMELEN];
                struct xt_target *target;
@@ -154,8 +148,7 @@ struct ebt_entry_target
 };
 #define EBT_STANDARD_TARGET "standard"
-struct ebt_standard_target
+struct ebt_standard_target {
-{
        struct ebt_entry_target target;
        int verdict;
 };
@@ -206,8 +199,7 @@ struct ebt_entry {
 #define EBT_MATCH 0
 #define EBT_NOMATCH 1
-struct ebt_match
+struct ebt_match {
-{
        struct list_head list;
        const char name[EBT_FUNCTION_MAXNAMELEN];
        bool (*match)(const struct sk_buff *skb, const struct net_device *in,
@@ -224,8 +216,7 @@ struct ebt_match
        struct module *me;
 };
-struct ebt_watcher
+struct ebt_watcher {
-{
        struct list_head list;
        const char name[EBT_FUNCTION_MAXNAMELEN];
        unsigned int (*target)(struct sk_buff *skb,
@@ -242,8 +233,7 @@ struct ebt_watcher
        struct module *me;
 };
-struct ebt_target
+struct ebt_target {
-{
        struct list_head list;
        const char name[EBT_FUNCTION_MAXNAMELEN];
        /* returns one of the standard EBT_* verdicts */
@@ -262,15 +252,13 @@ struct ebt_target
 };
 /* used for jumping from and into user defined chains (udc) */
-struct ebt_chainstack
+struct ebt_chainstack {
-{
        struct ebt_entries *chaininfo; /* pointer to chain data */
        struct ebt_entry *e; /* pointer to entry data */
        unsigned int n; /* n'th entry */
 };
-struct ebt_table_info
+struct ebt_table_info {
-{
        /* total size of the entries */
        unsigned int entries_size;
        unsigned int nentries;
@@ -282,8 +270,7 @@ struct ebt_table_info
        struct ebt_counter counters[0] ____cacheline_aligned;
 };
-struct ebt_table
+struct ebt_table {
-{
        struct list_head list;
        char name[EBT_TABLE_MAXNAMELEN];
        struct ebt_replace_kernel *table;
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 61fafc868a7b..27b3f5807305 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -76,8 +76,7 @@ struct ipt_ip {
 /* This structure defines each of the firewall rules.  Consists of 3
   parts which are 1) general IP header stuff 2) match specific
   stuff 3) the target to perform if the rule matches */
-struct ipt_entry
+struct ipt_entry {
-{
        struct ipt_ip ip;
        /* Mark with fields that we care about. */
@@ -135,8 +134,7 @@ struct ipt_entry
 #define IPT_UDP_INV_MASK        XT_UDP_INV_MASK
 /* ICMP matching stuff */
-struct ipt_icmp
+struct ipt_icmp {
-{
        u_int8_t type;                          /* type to match */
        u_int8_t code[2];                       /* range of code */
        u_int8_t invflags;                      /* Inverse flags */
@@ -146,8 +144,7 @@ struct ipt_icmp
 #define IPT_ICMP_INV    0x01    /* Invert the sense of type/code test */
 /* The argument to IPT_SO_GET_INFO */
-struct ipt_getinfo
+struct ipt_getinfo {
-{
        /* Which table: caller fills this in. */
        char name[IPT_TABLE_MAXNAMELEN];
@@ -169,8 +166,7 @@ struct ipt_getinfo
 };
 /* The argument to IPT_SO_SET_REPLACE. */
-struct ipt_replace
+struct ipt_replace {
-{
        /* Which table. */
        char name[IPT_TABLE_MAXNAMELEN];
@@ -204,8 +200,7 @@ struct ipt_replace
 #define ipt_counters_info xt_counters_info
 /* The argument to IPT_SO_GET_ENTRIES. */
-struct ipt_get_entries
+struct ipt_get_entries {
-{
        /* Which table: user fills this in. */
        char name[IPT_TABLE_MAXNAMELEN];
@@ -250,20 +245,17 @@ extern struct xt_table *ipt_register_table(struct net *net,
 extern void ipt_unregister_table(struct xt_table *table);
 /* Standard entry. */
-struct ipt_standard
+struct ipt_standard {
-{
        struct ipt_entry entry;
        struct ipt_standard_target target;
 };
-struct ipt_error_target
+struct ipt_error_target {
-{
        struct ipt_entry_target target;
        char errorname[IPT_FUNCTION_MAXNAMELEN];
 };
-struct ipt_error
+struct ipt_error {
-{
        struct ipt_entry entry;
        struct ipt_error_target target;
 };
@@ -301,8 +293,7 @@ extern unsigned int ipt_do_table(struct sk_buff *skb,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
-struct compat_ipt_entry
+struct compat_ipt_entry {
-{
        struct ipt_ip ip;
        compat_uint_t nfcache;
        u_int16_t target_offset;
diff --git a/include/linux/netfilter_ipv4/ipt_SAME.h b/include/linux/netfilter_ipv4/ipt_SAME.h
index be6e682a85ec..2529660c5b38 100644
--- a/include/linux/netfilter_ipv4/ipt_SAME.h
+++ b/include/linux/netfilter_ipv4/ipt_SAME.h
@@ -5,8 +5,7 @@
 #define IPT_SAME_NODST          0x01
-struct ipt_same_info
+struct ipt_same_info {
-{
        unsigned char info;
        u_int32_t rangesize;
        u_int32_t ipnum;
diff --git a/include/linux/netfilter_ipv4/ipt_ah.h b/include/linux/netfilter_ipv4/ipt_ah.h
index 7b9a2ac7adb9..2e555b4d05e3 100644
--- a/include/linux/netfilter_ipv4/ipt_ah.h
+++ b/include/linux/netfilter_ipv4/ipt_ah.h
@@ -1,8 +1,7 @@
 #ifndef _IPT_AH_H
 #define _IPT_AH_H
-struct ipt_ah
+struct ipt_ah {
-{
        u_int32_t spis[2];                      /* Security Parameter Index */
        u_int8_t  invflags;                     /* Inverse flags */
 };
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index a64e1451ac38..b31050d20ae4 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -88,8 +88,7 @@ struct ip6t_ip6 {
 /* This structure defines each of the firewall rules.  Consists of 3
   parts which are 1) general IP header stuff 2) match specific
   stuff 3) the target to perform if the rule matches */
-struct ip6t_entry
+struct ip6t_entry {
-{
        struct ip6t_ip6 ipv6;
        /* Mark with fields that we care about. */
@@ -111,20 +110,17 @@ struct ip6t_entry
 };
 /* Standard entry */
-struct ip6t_standard
+struct ip6t_standard {
-{
        struct ip6t_entry entry;
        struct ip6t_standard_target target;
 };
-struct ip6t_error_target
+struct ip6t_error_target {
-{
        struct ip6t_entry_target target;
        char errorname[IP6T_FUNCTION_MAXNAMELEN];
 };
-struct ip6t_error
+struct ip6t_error {
-{
        struct ip6t_entry entry;
        struct ip6t_error_target target;
 };
@@ -195,8 +191,7 @@ struct ip6t_error
 #define IP6T_UDP_INV_MASK       XT_UDP_INV_MASK
 /* ICMP matching stuff */
-struct ip6t_icmp
+struct ip6t_icmp {
-{
        u_int8_t type;                          /* type to match */
        u_int8_t code[2];                       /* range of code */
        u_int8_t invflags;                      /* Inverse flags */
@@ -206,8 +201,7 @@ struct ip6t_icmp
 #define IP6T_ICMP_INV   0x01    /* Invert the sense of type/code test */
 /* The argument to IP6T_SO_GET_INFO */
-struct ip6t_getinfo
+struct ip6t_getinfo {
-{
        /* Which table: caller fills this in. */
        char name[IP6T_TABLE_MAXNAMELEN];
@@ -229,8 +223,7 @@ struct ip6t_getinfo
 };
 /* The argument to IP6T_SO_SET_REPLACE. */
-struct ip6t_replace
+struct ip6t_replace {
-{
        /* Which table. */
        char name[IP6T_TABLE_MAXNAMELEN];
@@ -264,8 +257,7 @@ struct ip6t_replace
 #define ip6t_counters_info xt_counters_info
 /* The argument to IP6T_SO_GET_ENTRIES. */
-struct ip6t_get_entries
+struct ip6t_get_entries {
-{
        /* Which table: user fills this in. */
        char name[IP6T_TABLE_MAXNAMELEN];
@@ -330,8 +322,7 @@ extern int ip6_masked_addrcmp(const struct in6_addr *addr1,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
-struct compat_ip6t_entry
+struct compat_ip6t_entry {
-{
        struct ip6t_ip6 ipv6;
        compat_uint_t nfcache;
        u_int16_t target_offset;
diff --git a/include/linux/netfilter_ipv6/ip6t_ah.h b/include/linux/netfilter_ipv6/ip6t_ah.h
index 8531879eb464..17a745cfb2c7 100644
--- a/include/linux/netfilter_ipv6/ip6t_ah.h
+++ b/include/linux/netfilter_ipv6/ip6t_ah.h
@@ -1,8 +1,7 @@
 #ifndef _IP6T_AH_H
 #define _IP6T_AH_H
-struct ip6t_ah
+struct ip6t_ah {
-{
        u_int32_t spis[2];                      /* Security Parameter Index */
        u_int32_t hdrlen;                       /* Header Length */
        u_int8_t  hdrres;                       /* Test of the Reserved Filed */
diff --git a/include/linux/netfilter_ipv6/ip6t_frag.h b/include/linux/netfilter_ipv6/ip6t_frag.h
index 66070a0d6dfc..3724d0850920 100644
--- a/include/linux/netfilter_ipv6/ip6t_frag.h
+++ b/include/linux/netfilter_ipv6/ip6t_frag.h
@@ -1,8 +1,7 @@
 #ifndef _IP6T_FRAG_H
 #define _IP6T_FRAG_H
-struct ip6t_frag
+struct ip6t_frag {
-{
        u_int32_t ids[2];                       /* Security Parameter Index */
        u_int32_t hdrlen;                       /* Header Length */
        u_int8_t  flags;                        /*  */
diff --git a/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/include/linux/netfilter_ipv6/ip6t_ipv6header.h
index 51c53fc9c44a..01dfd445596a 100644
--- a/include/linux/netfilter_ipv6/ip6t_ipv6header.h
+++ b/include/linux/netfilter_ipv6/ip6t_ipv6header.h
@@ -8,8 +8,7 @@ on whether they contain certain headers */
 #ifndef __IPV6HEADER_H
 #define __IPV6HEADER_H
-struct ip6t_ipv6header_info
+struct ip6t_ipv6header_info {
-{
        u_int8_t matchflags;
        u_int8_t invflags;
        u_int8_t modeflag;
diff --git a/include/linux/netfilter_ipv6/ip6t_mh.h b/include/linux/netfilter_ipv6/ip6t_mh.h
index b9ca9a5f74d0..18549bca2d1f 100644
--- a/include/linux/netfilter_ipv6/ip6t_mh.h
+++ b/include/linux/netfilter_ipv6/ip6t_mh.h
@@ -2,8 +2,7 @@
 #define _IP6T_MH_H
 /* MH matching stuff */
-struct ip6t_mh
+struct ip6t_mh {
-{
        u_int8_t types[2];      /* MH type range */
        u_int8_t invflags;      /* Inverse flags */
 };
diff --git a/include/linux/netfilter_ipv6/ip6t_opts.h b/include/linux/netfilter_ipv6/ip6t_opts.h
index a07e36380ae8..62d89bcd9f9c 100644
--- a/include/linux/netfilter_ipv6/ip6t_opts.h
+++ b/include/linux/netfilter_ipv6/ip6t_opts.h
@@ -3,8 +3,7 @@
 #define IP6T_OPTS_OPTSNR 16
-struct ip6t_opts
+struct ip6t_opts {
-{
        u_int32_t hdrlen;                       /* Header Length */
        u_int8_t flags;                         /*  */
        u_int8_t invflags;                      /* Inverse flags */
diff --git a/include/linux/netfilter_ipv6/ip6t_rt.h b/include/linux/netfilter_ipv6/ip6t_rt.h
index 52156023e8db..ab91bfd2cd00 100644
--- a/include/linux/netfilter_ipv6/ip6t_rt.h
+++ b/include/linux/netfilter_ipv6/ip6t_rt.h
@@ -5,8 +5,7 @@
 #define IP6T_RT_HOPS 16
-struct ip6t_rt
+struct ip6t_rt {
-{
        u_int32_t rt_type;                      /* Routing Type */
        u_int32_t segsleft[2];                  /* Segments Left */
        u_int32_t hdrlen;                       /* Header Length */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index ab5d3126831f..fde27c017326 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -29,16 +29,14 @@
 struct net;
-struct sockaddr_nl
+struct sockaddr_nl {
-{
        sa_family_t     nl_family;      /* AF_NETLINK   */
        unsigned short  nl_pad;         /* zero         */
        __u32           nl_pid;         /* port ID      */
        __u32           nl_groups;      /* multicast groups mask */
 };
-struct nlmsghdr
+struct nlmsghdr {
-{
        __u32           nlmsg_len;      /* Length of message including header */
        __u16           nlmsg_type;     /* Message content */
        __u16           nlmsg_flags;    /* Additional flags */
@@ -94,8 +92,7 @@ struct nlmsghdr
 #define NLMSG_MIN_TYPE          0x10    /* < 0x10: reserved control messages */
-struct nlmsgerr
+struct nlmsgerr {
-{
        int             error;
        struct nlmsghdr msg;
 };
@@ -106,8 +103,7 @@ struct nlmsgerr
 #define NETLINK_BROADCAST_ERROR 4
 #define NETLINK_NO_ENOBUFS      5
-struct nl_pktinfo
+struct nl_pktinfo {
-{
        __u32   group;
 };
@@ -127,8 +123,7 @@ enum {
 *  <-------------- nlattr->nla_len -------------->
 */
-struct nlattr
+struct nlattr {
-{
        __u16           nla_len;
        __u16           nla_type;
 };
@@ -161,8 +156,7 @@ static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)
        return (struct nlmsghdr *)skb->data;
 }
-struct netlink_skb_parms
+struct netlink_skb_parms {
-{
        struct ucred            creds;          /* Skb credentials      */
        __u32                   pid;
        __u32                   dst_group;
@@ -220,8 +214,7 @@ int netlink_sendskb(struct sock *sk, struct sk_buff *skb);
 #define NLMSG_DEFAULT_SIZE (NLMSG_GOODSIZE - NLMSG_HDRLEN)
-struct netlink_callback
+struct netlink_callback {
-{
        struct sk_buff          *skb;
        const struct nlmsghdr   *nlh;
        int                     (*dump)(struct sk_buff * skb,
@@ -231,8 +224,7 @@ struct netlink_callback
        long                    args[6];
 };
-struct netlink_notify
+struct netlink_notify {
-{
        struct net *net;
        int pid;
        int protocol;
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index a8d71ed43a0e..da8ea2e19273 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -160,6 +160,11 @@
 * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
 *      partial scan results may be available
 *
+ * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation
+ *      or noise level
+ * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
+ *      NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
+ *
 * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
 *      has been changed and provides details of the request information
 *      that caused the change such as who initiated the regulatory request
@@ -341,6 +346,13 @@ enum nl80211_commands {
        NL80211_CMD_SET_WIPHY_NETNS,
+        NL80211_CMD_GET_SURVEY,
+        NL80211_CMD_NEW_SURVEY_RESULTS,
+        NL80211_CMD_SET_PMKSA,
+        NL80211_CMD_DEL_PMKSA,
+        NL80211_CMD_FLUSH_PMKSA,
        /* add new commands above here */
        /* used to define NL80211_CMD_MAX below */
@@ -584,6 +596,16 @@ enum nl80211_commands {
 *      changed then the list changed and the dump should be repeated
 *      completely from scratch.
 *
+ * @NL80211_ATTR_4ADDR: Use 4-address frames on a virtual interface
+ *
+ * @NL80211_ATTR_SURVEY_INFO: survey information about a channel, part of
+ *      the survey response for %NL80211_CMD_GET_SURVEY, nested attribute
+ *      containing info as possible, see &enum survey_info.
+ *
+ * @NL80211_ATTR_PMKID: PMK material for PMKSA caching.
+ * @NL80211_ATTR_MAX_NUM_PMKIDS: maximum number of PMKIDs a firmware can
+ *      cache, a wiphy attribute.
+ *
 * @NL80211_ATTR_MAX: highest attribute number currently defined
 * @__NL80211_ATTR_AFTER_LAST: internal use
 */
@@ -714,6 +736,13 @@ enum nl80211_attrs {
        NL80211_ATTR_PID,
+        NL80211_ATTR_4ADDR,
+        NL80211_ATTR_SURVEY_INFO,
+        NL80211_ATTR_PMKID,
+        NL80211_ATTR_MAX_NUM_PMKIDS,
        /* add attributes here, update the policy in nl80211.c */
        __NL80211_ATTR_AFTER_LAST,
@@ -895,14 +924,14 @@ enum nl80211_sta_info {
 *
 * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
 * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running
- * @NL80211_MPATH_FLAG_DSN_VALID: the mesh path contains a valid DSN
+ * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN
 * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set
 * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded
 */
 enum nl80211_mpath_flags {
        NL80211_MPATH_FLAG_ACTIVE =     1<<0,
        NL80211_MPATH_FLAG_RESOLVING =  1<<1,
-        NL80211_MPATH_FLAG_DSN_VALID =  1<<2,
+        NL80211_MPATH_FLAG_SN_VALID =   1<<2,
        NL80211_MPATH_FLAG_FIXED =      1<<3,
        NL80211_MPATH_FLAG_RESOLVED =   1<<4,
 };
@@ -915,7 +944,7 @@ enum nl80211_mpath_flags {
 *
 * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved
 * @NL80211_ATTR_MPATH_FRAME_QLEN: number of queued frames for this destination
- * @NL80211_ATTR_MPATH_DSN: destination sequence number
+ * @NL80211_ATTR_MPATH_SN: destination sequence number
 * @NL80211_ATTR_MPATH_METRIC: metric (cost) of this mesh path
 * @NL80211_ATTR_MPATH_EXPTIME: expiration time for the path, in msec from now
 * @NL80211_ATTR_MPATH_FLAGS: mesh path flags, enumerated in
@@ -926,7 +955,7 @@ enum nl80211_mpath_flags {
 enum nl80211_mpath_info {
        __NL80211_MPATH_INFO_INVALID,
        NL80211_MPATH_INFO_FRAME_QLEN,
-        NL80211_MPATH_INFO_DSN,
+        NL80211_MPATH_INFO_SN,
        NL80211_MPATH_INFO_METRIC,
        NL80211_MPATH_INFO_EXPTIME,
        NL80211_MPATH_INFO_FLAGS,
@@ -1117,6 +1146,26 @@ enum nl80211_reg_rule_flags {
 };
 /**
+ * enum nl80211_survey_info - survey information
+ *
+ * These attribute types are used with %NL80211_ATTR_SURVEY_INFO
+ * when getting information about a survey.
+ *
+ * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved
+ * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
+ * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
+ */
+enum nl80211_survey_info {
+        __NL80211_SURVEY_INFO_INVALID,
+        NL80211_SURVEY_INFO_FREQUENCY,
+        NL80211_SURVEY_INFO_NOISE,
+        /* keep last */
+        __NL80211_SURVEY_INFO_AFTER_LAST,
+        NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
+};
+/**
 * enum nl80211_mntr_flags - monitor configuration flags
 *
 * Monitor configuration flags.
@@ -1196,6 +1245,8 @@ enum nl80211_mntr_flags {
 * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
 * that it takes for an HWMP information element to propagate across the mesh
 *
+ * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not
+ *
 * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
 *
 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
@@ -1215,6 +1266,7 @@ enum nl80211_meshconf_params {
        NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
        NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
        NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+        NL80211_MESHCONF_HWMP_ROOTMODE,
        /* keep last */
        __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -1277,6 +1329,7 @@ enum nl80211_channel_type {
 * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
 *      in unspecified units, scaled to 0..100 (u8)
 * @NL80211_BSS_STATUS: status, if this BSS is "used"
+ * @NL80211_BSS_SEEN_MS_AGO: age of this BSS entry in ms
 * @__NL80211_BSS_AFTER_LAST: internal
 * @NL80211_BSS_MAX: highest BSS attribute
 */
@@ -1291,6 +1344,7 @@ enum nl80211_bss {
        NL80211_BSS_SIGNAL_MBM,
        NL80211_BSS_SIGNAL_UNSPEC,
        NL80211_BSS_STATUS,
+        NL80211_BSS_SEEN_MS_AGO,
        /* keep last */
        __NL80211_BSS_AFTER_LAST,
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index b7d9435d5a9f..33d9f5175109 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -65,6 +65,9 @@ enum {
        IEEE802154_ATTR_SEC,
        IEEE802154_ATTR_PAGE,
+        IEEE802154_ATTR_CHANNEL_PAGE_LIST,
+        IEEE802154_ATTR_PHY_NAME,
        __IEEE802154_ATTR_MAX,
 };
@@ -114,6 +117,9 @@ enum {
        IEEE802154_RX_ENABLE_CONF, /* Not supported yet */
        IEEE802154_LIST_IFACE,
+        IEEE802154_LIST_PHY,
+        IEEE802154_ADD_IFACE,
+        IEEE802154_DEL_IFACE,
        __IEEE802154_CMD_MAX,
 };
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 44428d247dbe..fee6c2f68075 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -201,6 +201,8 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_PRE_UP           0x000D
 #define NETDEV_BONDING_OLDTYPE  0x000E
 #define NETDEV_BONDING_NEWTYPE  0x000F
+#define NETDEV_POST_INIT        0x0010
+#define NETDEV_UNREGISTER_BATCH 0x0011
 #define SYS_DOWN        0x0001  /* Notify of system down */
 #define SYS_RESTART     SYS_DOWN
diff --git a/include/linux/of.h b/include/linux/of.h
index 7be2d1043c16..e7facd8fbce8 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -17,14 +17,117 @@
 */
 #include <linux/types.h>
 #include <linux/bitops.h>
+#include <linux/kref.h>
 #include <linux/mod_devicetable.h>
+typedef u32 phandle;
+typedef u32 ihandle;
+struct property {
+        char    *name;
+        int     length;
+        void    *value;
+        struct property *next;
+        unsigned long _flags;
+        unsigned int unique_id;
+};
+#if defined(CONFIG_SPARC)
+struct of_irq_controller;
+#endif
+struct device_node {
+        const char *name;
+        const char *type;
+        phandle node;
+#if !defined(CONFIG_SPARC)
+        phandle linux_phandle;
+#endif
+        char    *full_name;
+        struct  property *properties;
+        struct  property *deadprops;    /* removed properties */
+        struct  device_node *parent;
+        struct  device_node *child;
+        struct  device_node *sibling;
+        struct  device_node *next;      /* next device of same type */
+        struct  device_node *allnext;   /* next in list of all nodes */
+        struct  proc_dir_entry *pde;    /* this node's proc directory */
+        struct  kref kref;
+        unsigned long _flags;
+        void    *data;
+#if defined(CONFIG_SPARC)
+        char    *path_component_name;
+        unsigned int unique_id;
+        struct of_irq_controller *irq_trans;
+#endif
+};
+static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
+{
+        return test_bit(flag, &n->_flags);
+}
+static inline void of_node_set_flag(struct device_node *n, unsigned long flag)
+{
+        set_bit(flag, &n->_flags);
+}
+static inline void
+set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de)
+{
+        dn->pde = de;
+}
+extern struct device_node *of_find_all_nodes(struct device_node *prev);
+#if defined(CONFIG_SPARC)
+/* Dummy ref counting routines - to be implemented later */
+static inline struct device_node *of_node_get(struct device_node *node)
+{
+        return node;
+}
+static inline void of_node_put(struct device_node *node)
+{
+}
+#else
+extern struct device_node *of_node_get(struct device_node *node);
+extern void of_node_put(struct device_node *node);
+#endif
+/*
+ * OF address retreival & translation
+ */
+/* Helper to read a big number; size is in cells (not bytes) */
+static inline u64 of_read_number(const u32 *cell, int size)
+{
+        u64 r = 0;
+        while (size--)
+                r = (r << 32) | *(cell++);
+        return r;
+}
+/* Like of_read_number, but we want an unsigned long result */
+#ifdef CONFIG_PPC32
+static inline unsigned long of_read_ulong(const u32 *cell, int size)
+{
+        return cell[size-1];
+}
+#else
+#define of_read_ulong(cell, size)       of_read_number(cell, size)
+#endif
 #include <asm/prom.h>
 /* flag descriptions */
 #define OF_DYNAMIC      1 /* node and properties were allocated via kmalloc */
 #define OF_DETACHED     2 /* node has been detached from the device tree */
+#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
+#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
 #define OF_BAD_ADDR     ((u64)-1)
 extern struct device_node *of_find_node_by_name(struct device_node *from,
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
new file mode 100644
index 000000000000..41d432b13553
--- /dev/null
+++ b/include/linux/of_fdt.h
@@ -0,0 +1,86 @@
+/*
+ * Definitions for working with the Flattened Device Tree data format
+ *
+ * Copyright 2009 Benjamin Herrenschmidt, IBM Corp
+ * benh@kernel.crashing.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ */
+#ifndef _LINUX_OF_FDT_H
+#define _LINUX_OF_FDT_H
+#include <linux/types.h>
+#include <linux/init.h>
+/* Definitions used by the flattened device tree */
+#define OF_DT_HEADER            0xd00dfeed      /* marker */
+#define OF_DT_BEGIN_NODE        0x1             /* Start of node, full name */
+#define OF_DT_END_NODE          0x2             /* End node */
+#define OF_DT_PROP              0x3             /* Property: name off, size,
+                                                 * content */
+#define OF_DT_NOP               0x4             /* nop */
+#define OF_DT_END               0x9
+#define OF_DT_VERSION           0x10
+#ifndef __ASSEMBLY__
+/*
+ * This is what gets passed to the kernel by prom_init or kexec
+ *
+ * The dt struct contains the device tree structure, full pathes and
+ * property contents. The dt strings contain a separate block with just
+ * the strings for the property names, and is fully page aligned and
+ * self contained in a page, so that it can be kept around by the kernel,
+ * each property name appears only once in this page (cheap compression)
+ *
+ * the mem_rsvmap contains a map of reserved ranges of physical memory,
+ * passing it here instead of in the device-tree itself greatly simplifies
+ * the job of everybody. It's just a list of u64 pairs (base/size) that
+ * ends when size is 0
+ */
+struct boot_param_header {
+        u32     magic;                  /* magic word OF_DT_HEADER */
+        u32     totalsize;              /* total size of DT block */
+        u32     off_dt_struct;          /* offset to structure */
+        u32     off_dt_strings;         /* offset to strings */
+        u32     off_mem_rsvmap;         /* offset to memory reserve map */
+        u32     version;                /* format version */
+        u32     last_comp_version;      /* last compatible version */
+        /* version 2 fields below */
+        u32     boot_cpuid_phys;        /* Physical CPU id we're booting on */
+        /* version 3 fields below */
+        u32     dt_strings_size;        /* size of the DT strings block */
+        /* version 17 fields below */
+        u32     dt_struct_size;         /* size of the DT structure block */
+};
+/* For scanning the flat device-tree at boot time */
+extern int __init of_scan_flat_dt(int (*it)(unsigned long node,
+                                            const char *uname, int depth,
+                                            void *data),
+                                  void *data);
+extern void __init *of_get_flat_dt_prop(unsigned long node, const char *name,
+                                        unsigned long *size);
+extern int __init of_flat_dt_is_compatible(unsigned long node,
+                                           const char *name);
+extern unsigned long __init of_get_flat_dt_root(void);
+/* Other Prototypes */
+extern void finish_device_tree(void);
+extern void unflatten_device_tree(void);
+extern void early_init_devtree(void *);
+extern int machine_is_compatible(const char *compat);
+extern void print_properties(struct device_node *node);
+extern int prom_n_intr_cells(struct device_node* np);
+extern void prom_get_irq_senses(unsigned char *senses, int off, int max);
+extern int prom_add_property(struct device_node* np, struct property* prop);
+extern int prom_remove_property(struct device_node *np, struct property *prop);
+extern int prom_update_property(struct device_node *np,
+                                struct property *newprop,
+                                struct property *oldprop);
+#endif /* __ASSEMBLY__ */
+#endif /* _LINUX_OF_FDT_H */
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 3c842edff388..7f6ba8658abe 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -75,8 +75,7 @@ bits 9,10,11: redirect counter -  redirect TTL. Loop avoidance
 #define SET_TC_AT(v,n)   ((V_TC_AT(n)) | (v & ~M_TC_AT))
 /* Action attributes */
-enum
+enum {
-{
        TCA_ACT_UNSPEC,
        TCA_ACT_KIND,
        TCA_ACT_OPTIONS,
@@ -108,8 +107,7 @@ enum
 #define TC_ACT_JUMP             0x10000000
 /* Action type identifiers*/
-enum
+enum {
-{
        TCA_ID_UNSPEC=0,
        TCA_ID_POLICE=1,
        /* other actions go here */
@@ -118,8 +116,7 @@ enum
 #define TCA_ID_MAX __TCA_ID_MAX
-struct tc_police
+struct tc_police {
-{
        __u32                   index;
        int                     action;
 #define TC_POLICE_UNSPEC        TC_ACT_UNSPEC
@@ -138,15 +135,13 @@ struct tc_police
        __u32                   capab;
 };
-struct tcf_t
+struct tcf_t {
-{
        __u64   install;
        __u64   lastuse;
        __u64   expires;
 };
-struct tc_cnt
+struct tc_cnt {
-{
        int                   refcnt; 
        int                   bindcnt;
 };
@@ -158,8 +153,7 @@ struct tc_cnt
        int                   refcnt; \
        int                   bindcnt
-enum
+enum {
-{
        TCA_POLICE_UNSPEC,
        TCA_POLICE_TBF,
        TCA_POLICE_RATE,
@@ -182,8 +176,7 @@ enum
 #define TC_U32_UNSPEC   0
 #define TC_U32_ROOT     (0xFFF00000)
-enum
+enum {
-{
        TCA_U32_UNSPEC,
        TCA_U32_CLASSID,
        TCA_U32_HASH,
@@ -200,16 +193,14 @@ enum
 #define TCA_U32_MAX (__TCA_U32_MAX - 1)
-struct tc_u32_key
+struct tc_u32_key {
-{
        __be32          mask;
        __be32          val;
        int             off;
        int             offmask;
 };
-struct tc_u32_sel
+struct tc_u32_sel {
-{
        unsigned char           flags;
        unsigned char           offshift;
        unsigned char           nkeys;
@@ -223,15 +214,13 @@ struct tc_u32_sel
        struct tc_u32_key       keys[0];
 };
-struct tc_u32_mark
+struct tc_u32_mark {
-{
        __u32           val;
        __u32           mask;
        __u32           success;
 };
-struct tc_u32_pcnt
+struct tc_u32_pcnt {
-{
        __u64 rcnt;
        __u64 rhit;
        __u64 kcnts[0];
@@ -249,8 +238,7 @@ struct tc_u32_pcnt
 /* RSVP filter */
-enum
+enum {
-{
        TCA_RSVP_UNSPEC,
        TCA_RSVP_CLASSID,
        TCA_RSVP_DST,
@@ -263,15 +251,13 @@ enum
 #define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
-struct tc_rsvp_gpi
+struct tc_rsvp_gpi {
-{
        __u32   key;
        __u32   mask;
        int     offset;
 };
-struct tc_rsvp_pinfo
+struct tc_rsvp_pinfo {
-{
        struct tc_rsvp_gpi dpi;
        struct tc_rsvp_gpi spi;
        __u8    protocol;
@@ -282,8 +268,7 @@ struct tc_rsvp_pinfo
 /* ROUTE filter */
-enum
+enum {
-{
        TCA_ROUTE4_UNSPEC,
        TCA_ROUTE4_CLASSID,
        TCA_ROUTE4_TO,
@@ -299,8 +284,7 @@ enum
 /* FW filter */
-enum
+enum {
-{
        TCA_FW_UNSPEC,
        TCA_FW_CLASSID,
        TCA_FW_POLICE,
@@ -314,8 +298,7 @@ enum
 /* TC index filter */
-enum
+enum {
-{
        TCA_TCINDEX_UNSPEC,
        TCA_TCINDEX_HASH,
        TCA_TCINDEX_MASK,
@@ -331,8 +314,7 @@ enum
 /* Flow filter */
-enum
+enum {
-{
        FLOW_KEY_SRC,
        FLOW_KEY_DST,
        FLOW_KEY_PROTO,
@@ -355,14 +337,12 @@ enum
 #define FLOW_KEY_MAX    (__FLOW_KEY_MAX - 1)
-enum
+enum {
-{
        FLOW_MODE_MAP,
        FLOW_MODE_HASH,
 };
-enum
+enum {
-{
        TCA_FLOW_UNSPEC,
        TCA_FLOW_KEYS,
        TCA_FLOW_MODE,
@@ -383,8 +363,7 @@ enum
 /* Basic filter */
-enum
+enum {
-{
        TCA_BASIC_UNSPEC,
        TCA_BASIC_CLASSID,
        TCA_BASIC_EMATCHES,
@@ -398,8 +377,7 @@ enum
 /* Cgroup classifier */
-enum
+enum {
-{
        TCA_CGROUP_UNSPEC,
        TCA_CGROUP_ACT,
        TCA_CGROUP_POLICE,
@@ -411,14 +389,12 @@ enum
 /* Extended Matches */
-struct tcf_ematch_tree_hdr
+struct tcf_ematch_tree_hdr {
-{
        __u16           nmatches;
        __u16           progid;
 };
-enum
+enum {
-{
        TCA_EMATCH_TREE_UNSPEC,
        TCA_EMATCH_TREE_HDR,
        TCA_EMATCH_TREE_LIST,
@@ -426,8 +402,7 @@ enum
 };
 #define TCA_EMATCH_TREE_MAX (__TCA_EMATCH_TREE_MAX - 1)
-struct tcf_ematch_hdr
+struct tcf_ematch_hdr {
-{
        __u16           matchid;
        __u16           kind;
        __u16           flags;
@@ -457,8 +432,7 @@ struct tcf_ematch_hdr
 #define TCF_EM_REL_MASK 3
 #define TCF_EM_REL_VALID(v) (((v) & TCF_EM_REL_MASK) != TCF_EM_REL_MASK)
-enum
+enum {
-{
        TCF_LAYER_LINK,
        TCF_LAYER_NETWORK,
        TCF_LAYER_TRANSPORT,
@@ -479,13 +453,11 @@ enum
 #define        TCF_EM_VLAN              6
 #define TCF_EM_MAX              6
-enum
+enum {
-{
        TCF_EM_PROG_TC
 };
-enum
+enum {
-{
        TCF_EM_OPND_EQ,
        TCF_EM_OPND_GT,
        TCF_EM_OPND_LT
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index d51a2b3e221e..2cfa4bc8dea6 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -29,8 +29,7 @@
   Particular schedulers may have also their private records.
 */
-struct tc_stats
+struct tc_stats {
-{
        __u64   bytes;                  /* NUmber of enqueues bytes */
        __u32   packets;                /* Number of enqueued packets   */
        __u32   drops;                  /* Packets dropped because of lack of resources */
@@ -42,8 +41,7 @@ struct tc_stats
        __u32   backlog;
 };
-struct tc_estimator
+struct tc_estimator {
-{
        signed char     interval;
        unsigned char   ewma_log;
 };
@@ -75,8 +73,7 @@ struct tc_estimator
 #define TC_H_ROOT       (0xFFFFFFFFU)
 #define TC_H_INGRESS    (0xFFFFFFF1U)
-struct tc_ratespec
+struct tc_ratespec {
-{
        unsigned char   cell_log;
        unsigned char   __reserved;
        unsigned short  overhead;
@@ -109,8 +106,7 @@ enum {
 /* FIFO section */
-struct tc_fifo_qopt
+struct tc_fifo_qopt {
-{
        __u32   limit;  /* Queue length: bytes for bfifo, packets for pfifo */
 };
@@ -119,8 +115,7 @@ struct tc_fifo_qopt
 #define TCQ_PRIO_BANDS  16
 #define TCQ_MIN_PRIO_BANDS 2
-struct tc_prio_qopt
+struct tc_prio_qopt {
-{
        int     bands;                  /* Number of bands */
        __u8    priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
 };
@@ -134,8 +129,7 @@ struct tc_multiq_qopt {
 /* TBF section */
-struct tc_tbf_qopt
+struct tc_tbf_qopt {
-{
        struct tc_ratespec rate;
        struct tc_ratespec peakrate;
        __u32           limit;
@@ -143,8 +137,7 @@ struct tc_tbf_qopt
        __u32           mtu;
 };
-enum
+enum {
-{
        TCA_TBF_UNSPEC,
        TCA_TBF_PARMS,
        TCA_TBF_RTAB,
@@ -161,8 +154,7 @@ enum
 /* SFQ section */
-struct tc_sfq_qopt
+struct tc_sfq_qopt {
-{
        unsigned        quantum;        /* Bytes per round allocated to flow */
        int             perturb_period; /* Period of hash perturbation */
        __u32           limit;          /* Maximal packets in queue */
@@ -170,8 +162,7 @@ struct tc_sfq_qopt
        unsigned        flows;          /* Maximal number of flows  */
 };
-struct tc_sfq_xstats
+struct tc_sfq_xstats {
-{
        __s32           allot;
 };
@@ -186,8 +177,7 @@ struct tc_sfq_xstats
 /* RED section */
-enum
+enum {
-{
        TCA_RED_UNSPEC,
        TCA_RED_PARMS,
        TCA_RED_STAB,
@@ -196,8 +186,7 @@ enum
 #define TCA_RED_MAX (__TCA_RED_MAX - 1)
-struct tc_red_qopt
+struct tc_red_qopt {
-{
        __u32           limit;          /* HARD maximal queue length (bytes)    */
        __u32           qth_min;        /* Min average length threshold (bytes) */
        __u32           qth_max;        /* Max average length threshold (bytes) */
@@ -209,8 +198,7 @@ struct tc_red_qopt
 #define TC_RED_HARDDROP 2
 };
-struct tc_red_xstats
+struct tc_red_xstats {
-{
        __u32           early;          /* Early drops */
        __u32           pdrop;          /* Drops due to queue limits */
        __u32           other;          /* Drops due to drop() calls */
@@ -221,8 +209,7 @@ struct tc_red_xstats
 #define MAX_DPs 16
-enum
+enum {
-{
       TCA_GRED_UNSPEC,
       TCA_GRED_PARMS,
       TCA_GRED_STAB,
@@ -232,8 +219,7 @@ enum
 #define TCA_GRED_MAX (__TCA_GRED_MAX - 1)
-struct tc_gred_qopt
+struct tc_gred_qopt {
-{
        __u32           limit;        /* HARD maximal queue length (bytes)    */
        __u32           qth_min;      /* Min average length threshold (bytes) */
        __u32           qth_max;      /* Max average length threshold (bytes) */
@@ -253,8 +239,7 @@ struct tc_gred_qopt
 };
 /* gred setup */
-struct tc_gred_sopt
+struct tc_gred_sopt {
-{
        __u32           DPs;
        __u32           def_DP;
        __u8            grio;
@@ -267,8 +252,7 @@ struct tc_gred_sopt
 #define TC_HTB_MAXDEPTH         8
 #define TC_HTB_PROTOVER         3 /* the same as HTB and TC's major */
-struct tc_htb_opt
+struct tc_htb_opt {
-{
        struct tc_ratespec      rate;
        struct tc_ratespec      ceil;
        __u32   buffer;
@@ -277,8 +261,7 @@ struct tc_htb_opt
        __u32   level;          /* out only */
        __u32   prio;
 };
-struct tc_htb_glob
+struct tc_htb_glob {
-{
        __u32 version;          /* to match HTB/TC */
        __u32 rate2quantum;     /* bps->quantum divisor */
        __u32 defcls;           /* default class number */
@@ -287,8 +270,7 @@ struct tc_htb_glob
        /* stats */
        __u32 direct_pkts; /* count of non shapped packets */
 };
-enum
+enum {
-{
        TCA_HTB_UNSPEC,
        TCA_HTB_PARMS,
        TCA_HTB_INIT,
@@ -299,8 +281,7 @@ enum
 #define TCA_HTB_MAX (__TCA_HTB_MAX - 1)
-struct tc_htb_xstats
+struct tc_htb_xstats {
-{
        __u32 lends;
        __u32 borrows;
        __u32 giants;   /* too big packets (rate will not be accurate) */
@@ -310,28 +291,24 @@ struct tc_htb_xstats
 /* HFSC section */
-struct tc_hfsc_qopt
+struct tc_hfsc_qopt {
-{
        __u16   defcls;         /* default class */
 };
-struct tc_service_curve
+struct tc_service_curve {
-{
        __u32   m1;             /* slope of the first segment in bps */
        __u32   d;              /* x-projection of the first segment in us */
        __u32   m2;             /* slope of the second segment in bps */
 };
-struct tc_hfsc_stats
+struct tc_hfsc_stats {
-{
        __u64   work;           /* total work done */
        __u64   rtwork;         /* work done by real-time criteria */
        __u32   period;         /* current period */
        __u32   level;          /* class level in hierarchy */
 };
-enum
+enum {
-{
        TCA_HFSC_UNSPEC,
        TCA_HFSC_RSC,
        TCA_HFSC_FSC,
@@ -348,8 +325,7 @@ enum
 #define TC_CBQ_MAXLEVEL         8
 #define TC_CBQ_DEF_EWMA         5
-struct tc_cbq_lssopt
+struct tc_cbq_lssopt {
-{
        unsigned char   change;
        unsigned char   flags;
 #define TCF_CBQ_LSS_BOUNDED     1
@@ -368,8 +344,7 @@ struct tc_cbq_lssopt
        __u32           avpkt;
 };
-struct tc_cbq_wrropt
+struct tc_cbq_wrropt {
-{
        unsigned char   flags;
        unsigned char   priority;
        unsigned char   cpriority;
@@ -378,8 +353,7 @@ struct tc_cbq_wrropt
        __u32           weight;
 };
-struct tc_cbq_ovl
+struct tc_cbq_ovl {
-{
        unsigned char   strategy;
 #define TC_CBQ_OVL_CLASSIC      0
 #define TC_CBQ_OVL_DELAY        1
@@ -391,30 +365,26 @@ struct tc_cbq_ovl
        __u32           penalty;
 };
-struct tc_cbq_police
+struct tc_cbq_police {
-{
        unsigned char   police;
        unsigned char   __res1;
        unsigned short  __res2;
 };
-struct tc_cbq_fopt
+struct tc_cbq_fopt {
-{
        __u32           split;
        __u32           defmap;
        __u32           defchange;
 };
-struct tc_cbq_xstats
+struct tc_cbq_xstats {
-{
        __u32           borrows;
        __u32           overactions;
        __s32           avgidle;
        __s32           undertime;
 };
-enum
+enum {
-{
        TCA_CBQ_UNSPEC,
        TCA_CBQ_LSSOPT,
        TCA_CBQ_WRROPT,
@@ -459,8 +429,7 @@ enum {
 /* Network emulator */
-enum
+enum {
-{
        TCA_NETEM_UNSPEC,
        TCA_NETEM_CORR,
        TCA_NETEM_DELAY_DIST,
@@ -471,8 +440,7 @@ enum
 #define TCA_NETEM_MAX (__TCA_NETEM_MAX - 1)
-struct tc_netem_qopt
+struct tc_netem_qopt {
-{
        __u32   latency;        /* added delay (us) */
        __u32   limit;          /* fifo limit (packets) */
        __u32   loss;           /* random packet loss (0=none ~0=100%) */
@@ -481,21 +449,18 @@ struct tc_netem_qopt
        __u32   jitter;         /* random jitter in latency (us) */
 };
-struct tc_netem_corr
+struct tc_netem_corr {
-{
        __u32   delay_corr;     /* delay correlation */
        __u32   loss_corr;      /* packet loss correlation */
        __u32   dup_corr;       /* duplicate correlation  */
 };
-struct tc_netem_reorder
+struct tc_netem_reorder {
-{
        __u32   probability;
        __u32   correlation;
 };
-struct tc_netem_corrupt
+struct tc_netem_corrupt {
-{
        __u32   probability;
        __u32   correlation;
 };
@@ -504,8 +469,7 @@ struct tc_netem_corrupt
 /* DRR */
-enum
+enum {
-{
        TCA_DRR_UNSPEC,
        TCA_DRR_QUANTUM,
        __TCA_DRR_MAX
@@ -513,8 +477,7 @@ enum
 #define TCA_DRR_MAX     (__TCA_DRR_MAX - 1)
-struct tc_drr_stats
+struct tc_drr_stats {
-{
        __u32   deficit;
 };
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 3b7e04b95bd2..0d65934246af 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -178,9 +178,10 @@ typedef struct pm_message {
 *      This need not mean that the device should be put into a low power state.
 *      For example, if the device is behind a link which is about to be turned
 *      off, the device may remain at full power.  If the device does go to low
- *      power and if device_may_wakeup(dev) is true, remote wake-up (i.e., a
+ *      power and is capable of generating run-time wake-up events, remote
- *      hardware mechanism allowing the device to request a change of its power
+ *      wake-up (i.e., a hardware mechanism allowing the device to request a
- *      state, such as PCI PME) should be enabled for it.
+ *      change of its power state via a wake-up event, such as PCI PME) should
+ *      be enabled for it.
 *
 * @runtime_resume: Put the device into the fully active state in response to a
 *      wake-up event generated by hardware or at the request of software.  If
@@ -428,6 +429,7 @@ struct dev_pm_info {
        unsigned int            idle_notification:1;
        unsigned int            request_pending:1;
        unsigned int            deferred_resume:1;
+        unsigned int            run_wake:1;
        enum rpm_request        request;
        enum rpm_status         runtime_status;
        int                     runtime_error;
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 44087044910f..370ce0a6fe4a 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -50,6 +50,16 @@ static inline void pm_runtime_put_noidle(struct device *dev)
        atomic_add_unless(&dev->power.usage_count, -1, 0);
 }
+static inline bool device_run_wake(struct device *dev)
+{
+        return dev->power.run_wake;
+}
+static inline void device_set_run_wake(struct device *dev, bool enable)
+{
+        dev->power.run_wake = enable;
+}
 #else /* !CONFIG_PM_RUNTIME */
 static inline int pm_runtime_idle(struct device *dev) { return -ENOSYS; }
@@ -73,6 +83,8 @@ static inline bool pm_children_suspended(struct device *dev) { return false; }
 static inline void pm_suspend_ignore_children(struct device *dev, bool en) {}
 static inline void pm_runtime_get_noresume(struct device *dev) {}
 static inline void pm_runtime_put_noidle(struct device *dev) {}
+static inline bool device_run_wake(struct device *dev) { return false; }
+static inline void device_set_run_wake(struct device *dev, bool enable) {}
 #endif /* !CONFIG_PM_RUNTIME */
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index 5710f43bbc9e..1bf0f708c4fc 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -262,6 +262,20 @@ static inline void list_splice_init_rcu(struct list_head *list,
                (pos) = rcu_dereference((pos)->next))
 /**
+ * list_for_each_entry_continue_rcu - continue iteration over list of given type
+ * @pos:        the type * to use as a loop cursor.
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ *
+ * Continue to iterate over list of given type, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_rcu(pos, head, member)             \
+        for (pos = list_entry_rcu(pos->member.next, typeof(*pos), member); \
+             prefetch(pos->member.next), &pos->member != (head);        \
+             pos = list_entry_rcu(pos->member.next, typeof(*pos), member))
+/**
 * hlist_del_rcu - deletes entry from hash list without re-initialization
 * @n: the element to delete from the hash list.
 *
diff --git a/include/linux/rds.h b/include/linux/rds.h
index 89d46e1afbb1..cab4994c2f63 100644
--- a/include/linux/rds.h
+++ b/include/linux/rds.h
@@ -56,6 +56,7 @@
 /* deprecated: RDS_BARRIER 4 */
 #define RDS_RECVERR                     5
 #define RDS_CONG_MONITOR                6
+#define RDS_GET_MR_FOR_DEST             7
 /*
 * Control message types for SOL_RDS.
@@ -224,6 +225,13 @@ struct rds_get_mr_args {
        uint64_t        flags;
 };
+struct rds_get_mr_for_dest_args {
+        struct sockaddr_storage dest_addr;
+        struct rds_iovec        vec;
+        u_int64_t               cookie_addr;
+        uint64_t                flags;
+};
 struct rds_free_mr_args {
        rds_rdma_cookie_t cookie;
        u_int64_t       flags;
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 3392c59d2706..97059d08a626 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -35,6 +35,8 @@
 * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
 * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
 * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
+ * @RFKILL_TYPE_GPS: switch is on a GPS device.
+ * @RFKILL_TYPE_FM: switch is on a FM radio device.
 * @NUM_RFKILL_TYPES: number of defined rfkill types
 */
 enum rfkill_type {
@@ -45,6 +47,7 @@ enum rfkill_type {
        RFKILL_TYPE_WIMAX,
        RFKILL_TYPE_WWAN,
        RFKILL_TYPE_GPS,
+        RFKILL_TYPE_FM,
        NUM_RFKILL_TYPES,
 };
diff --git a/include/linux/route.h b/include/linux/route.h
index f7ed35d5e653..6600708311c8 100644
--- a/include/linux/route.h
+++ b/include/linux/route.h
@@ -27,8 +27,7 @@
 #include <linux/compiler.h>
 /* This structure gets passed by the SIOCADDRT and SIOCDELRT calls. */
-struct rtentry 
+struct rtentry {
-{
        unsigned long   rt_pad1;
        struct sockaddr rt_dst;         /* target address               */
        struct sockaddr rt_gateway;     /* gateway addr (RTF_GATEWAY)   */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index adf2068d12b5..14fc906ed602 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -127,8 +127,7 @@ enum {
   with attribute type.
 */
-struct rtattr
+struct rtattr {
-{
        unsigned short  rta_len;
        unsigned short  rta_type;
 };
@@ -154,8 +153,7 @@ struct rtattr
 *              Definitions used in routing table administration.
 ****/
-struct rtmsg
+struct rtmsg {
-{
        unsigned char           rtm_family;
        unsigned char           rtm_dst_len;
        unsigned char           rtm_src_len;
@@ -171,8 +169,7 @@ struct rtmsg
 /* rtm_type */
-enum
+enum {
-{
        RTN_UNSPEC,
        RTN_UNICAST,            /* Gateway or direct route      */
        RTN_LOCAL,              /* Accept locally               */
@@ -230,8 +227,7 @@ enum
   could be assigned a value between UNIVERSE and LINK.
 */
-enum rt_scope_t
+enum rt_scope_t {
-{
        RT_SCOPE_UNIVERSE=0,
 /* User defined values  */
        RT_SCOPE_SITE=200,
@@ -249,8 +245,7 @@ enum rt_scope_t
 /* Reserved table identifiers */
-enum rt_class_t
+enum rt_class_t {
-{
        RT_TABLE_UNSPEC=0,
 /* User defined values */
        RT_TABLE_COMPAT=252,
@@ -263,8 +258,7 @@ enum rt_class_t
 /* Routing message attributes */
-enum rtattr_type_t
+enum rtattr_type_t {
-{
        RTA_UNSPEC,
        RTA_DST,
        RTA_SRC,
@@ -298,8 +292,7 @@ enum rtattr_type_t
 * and rtt for different paths from multipath.
 */
-struct rtnexthop
+struct rtnexthop {
-{
        unsigned short          rtnh_len;
        unsigned char           rtnh_flags;
        unsigned char           rtnh_hops;
@@ -325,8 +318,7 @@ struct rtnexthop
 /* RTM_CACHEINFO */
-struct rta_cacheinfo
+struct rta_cacheinfo {
-{
        __u32   rta_clntref;
        __u32   rta_lastuse;
        __s32   rta_expires;
@@ -341,8 +333,7 @@ struct rta_cacheinfo
 /* RTM_METRICS --- array of struct rtattr with types of RTAX_* */
-enum
+enum {
-{
        RTAX_UNSPEC,
 #define RTAX_UNSPEC RTAX_UNSPEC
        RTAX_LOCK,
@@ -377,12 +368,13 @@ enum
 #define RTAX_MAX (__RTAX_MAX - 1)
 #define RTAX_FEATURE_ECN        0x00000001
-#define RTAX_FEATURE_SACK       0x00000002
+#define RTAX_FEATURE_NO_SACK    0x00000002
-#define RTAX_FEATURE_TIMESTAMP  0x00000004
+#define RTAX_FEATURE_NO_TSTAMP  0x00000004
 #define RTAX_FEATURE_ALLFRAG    0x00000008
+#define RTAX_FEATURE_NO_WSCALE  0x00000010
+#define RTAX_FEATURE_NO_DSACK   0x00000020
-struct rta_session
+struct rta_session {
-{
        __u8    proto;
        __u8    pad1;
        __u16   pad2;
@@ -407,8 +399,7 @@ struct rta_session
 *              General form of address family dependent message.
 ****/
-struct rtgenmsg
+struct rtgenmsg {
-{
        unsigned char           rtgen_family;
 };
@@ -421,8 +412,7 @@ struct rtgenmsg
 * on network protocol.
 */
-struct ifinfomsg
+struct ifinfomsg {
-{
        unsigned char   ifi_family;
        unsigned char   __ifi_pad;
        unsigned short  ifi_type;               /* ARPHRD_* */
@@ -435,8 +425,7 @@ struct ifinfomsg
 *              prefix information 
 ****/
-struct prefixmsg
+struct prefixmsg {
-{
        unsigned char   prefix_family;
        unsigned char   prefix_pad1;
        unsigned short  prefix_pad2;
@@ -457,8 +446,7 @@ enum
 #define PREFIX_MAX      (__PREFIX_MAX - 1)
-struct prefix_cacheinfo
+struct prefix_cacheinfo {
-{
        __u32   preferred_time;
        __u32   valid_time;
 };
@@ -468,8 +456,7 @@ struct prefix_cacheinfo
 *              Traffic control messages.
 ****/
-struct tcmsg
+struct tcmsg {
-{
        unsigned char   tcm_family;
        unsigned char   tcm__pad1;
        unsigned short  tcm__pad2;
@@ -479,8 +466,7 @@ struct tcmsg
        __u32           tcm_info;
 };
-enum
+enum {
-{
        TCA_UNSPEC,
        TCA_KIND,
        TCA_OPTIONS,
@@ -502,8 +488,7 @@ enum
 *              Neighbor Discovery userland options
 ****/
-struct nduseroptmsg
+struct nduseroptmsg {
-{
        unsigned char   nduseropt_family;
        unsigned char   nduseropt_pad1;
        unsigned short  nduseropt_opts_len;     /* Total length of options */
@@ -515,8 +500,7 @@ struct nduseroptmsg
        /* Followed by one or more ND options */
 };
-enum
+enum {
-{
        NDUSEROPT_UNSPEC,
        NDUSEROPT_SRCADDR,
        __NDUSEROPT_MAX
@@ -598,8 +582,7 @@ enum rtnetlink_groups {
 #define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
 /* TC action piece */
-struct tcamsg
+struct tcamsg {
-{
        unsigned char   tca_family;
        unsigned char   tca__pad1;
        unsigned short  tca__pad2;
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index b464b9d3d242..c20d3ce673c0 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -242,6 +242,7 @@ enum {
        SCTP_DATA_FIRST_FRAG    = 0x02,
        SCTP_DATA_NOT_FRAG      = 0x03,
        SCTP_DATA_UNORDERED     = 0x04,
+        SCTP_DATA_SACK_IMM      = 0x08,
 };
 enum { SCTP_DATA_FRAG_MASK = 0x03, };
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index db532ce288be..8c3dd36fe91a 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -179,6 +179,9 @@
 /* BCM63xx family SoCs */
 #define PORT_BCM63XX    89
+/* Aeroflex Gaisler GRLIB APBUART */
+#define PORT_APBUART    90
 #ifdef __KERNEL__
 #include <linux/compiler.h>
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index bcdd6606f468..ae836fded530 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -299,7 +299,7 @@ typedef unsigned char *sk_buff_data_t;
 *      @nfctinfo: Relationship of this skb to the connection
 *      @nfct_reasm: netfilter conntrack re-assembly pointer
 *      @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
- *      @iif: ifindex of device we arrived on
+ *      @skb_iif: ifindex of device we arrived on
 *      @queue_mapping: Queue mapping for multiqueue devices
 *      @tc_index: Traffic control index
 *      @tc_verd: traffic control verdict
@@ -366,7 +366,7 @@ struct sk_buff {
        struct nf_bridge_info   *nf_bridge;
 #endif
-        int                     iif;
+        int                     skb_iif;
 #ifdef CONFIG_NET_SCHED
        __u16                   tc_index;       /* traffic control index */
 #ifdef CONFIG_NET_CLS_ACT
@@ -389,8 +389,10 @@ struct sk_buff {
 #ifdef CONFIG_NETWORK_SECMARK
        __u32                   secmark;
 #endif
+        union {
-        __u32                   mark;
+                __u32           mark;
+                __u32           dropcount;
+        };
        __u16                   vlan_tci;
@@ -414,14 +416,6 @@ struct sk_buff {
 #include <asm/system.h>
-#ifdef CONFIG_HAS_DMA
-#include <linux/dma-mapping.h>
-extern int skb_dma_map(struct device *dev, struct sk_buff *skb,
-                       enum dma_data_direction dir);
-extern void skb_dma_unmap(struct device *dev, struct sk_buff *skb,
-                          enum dma_data_direction dir);
-#endif
 static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
 {
        return (struct dst_entry *)skb->_skb_dst;
@@ -489,8 +483,7 @@ extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
                        int len,int odd, struct sk_buff *skb),
                        void *from, int length);
-struct skb_seq_state
+struct skb_seq_state {
-{
        __u32           lower_offset;
        __u32           upper_offset;
        __u32           frag_idx;
@@ -1489,6 +1482,16 @@ static inline struct sk_buff *netdev_alloc_skb(struct net_device *dev,
        return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
 }
+static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+                unsigned int length)
+{
+        struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN);
+        if (NET_IP_ALIGN && skb)
+                skb_reserve(skb, NET_IP_ALIGN);
+        return skb;
+}
 extern struct page *__netdev_alloc_page(struct net_device *dev, gfp_t gfp_mask);
 /**
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h
index 5241e4fb4eca..7144e8aa1e41 100644
--- a/include/linux/smsc911x.h
+++ b/include/linux/smsc911x.h
@@ -30,6 +30,7 @@ struct smsc911x_platform_config {
        unsigned int irq_type;
        unsigned int flags;
        phy_interface_t phy_interface;
+        unsigned char mac[6];
 };
 /* Constants for platform_device irq polarity configuration */
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 3273a0c5043b..7b3aae2052a6 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -24,6 +24,9 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>                /* pid_t                        */
 #include <linux/compiler.h>             /* __user                       */
+#define __sockaddr_check_size(size)     \
+        BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
 #ifdef __KERNEL__
 # ifdef CONFIG_PROC_FS
 struct seq_file;
@@ -65,6 +68,12 @@ struct msghdr {
        unsigned        msg_flags;
 };
+/* For recvmmsg/sendmmsg */
+struct mmsghdr {
+        struct msghdr   msg_hdr;
+        unsigned        msg_len;
+};
 /*
 *      POSIX 1003.1g - ancillary data object information
 *      Ancillary data consits of a sequence of pairs of
@@ -312,6 +321,10 @@ extern int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uadd
 extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr);
 extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
+struct timespec;
+extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
+                          unsigned int flags, struct timespec *timeout);
 #endif
 #endif /* not kernel and not glibc */
 #endif /* _LINUX_SOCKET_H */
diff --git a/include/linux/spi/wl12xx.h b/include/linux/spi/wl12xx.h
index 11430cab2aad..aed64ed3dc8a 100644
--- a/include/linux/spi/wl12xx.h
+++ b/include/linux/spi/wl12xx.h
@@ -26,6 +26,7 @@
 struct wl12xx_platform_data {
        void (*set_power)(bool enable);
+        bool use_eeprom;
 };
 #endif
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 3d0a9ff24f01..24f988547361 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -269,7 +269,8 @@ struct ssb_bus {
        const struct ssb_bus_ops *ops;
-        /* The core in the basic address register window. (PCI bus only) */
+        /* The core currently mapped into the MMIO window.
+         * Not valid on all host-buses. So don't use outside of SSB. */
        struct ssb_device *mapped_device;
        union {
                /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
@@ -281,14 +282,17 @@ struct ssb_bus {
         * On PCMCIA-host busses this is used to protect the whole MMIO access. */
        spinlock_t bar_lock;
-        /* The bus this backplane is running on. */
+        /* The host-bus this backplane is running on. */
        enum ssb_bustype bustype;
-        /* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
+        /* Pointers to the host-bus. Check bustype before using any of these pointers. */
-        struct pci_dev *host_pci;
+        union {
-        /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
+                /* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
-        struct pcmcia_device *host_pcmcia;
+                struct pci_dev *host_pci;
-        /* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
+                /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
-        struct sdio_func *host_sdio;
+                struct pcmcia_device *host_pcmcia;
+                /* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
+                struct sdio_func *host_sdio;
+        };
        /* See enum ssb_quirks */
        unsigned int quirks;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index e79e2f3ccc51..bc70c5810fec 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -25,6 +25,7 @@ struct linux_dirent64;
 struct list_head;
 struct msgbuf;
 struct msghdr;
+struct mmsghdr;
 struct msqid_ds;
 struct new_utsname;
 struct nfsctl_arg;
@@ -628,6 +629,9 @@ asmlinkage long sys_recv(int, void __user *, size_t, unsigned);
 asmlinkage long sys_recvfrom(int, void __user *, size_t, unsigned,
                                struct sockaddr __user *, int __user *);
 asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned flags);
+asmlinkage long sys_recvmmsg(int fd, struct mmsghdr __user *msg,
+                             unsigned int vlen, unsigned flags,
+                             struct timespec __user *timeout);
 asmlinkage long sys_socket(int, int, int);
 asmlinkage long sys_socketpair(int, int, int, int __user *);
 asmlinkage long sys_socketcall(int call, unsigned long __user *args);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 1e4743ee6831..56af3ca75e24 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -15,9 +15,6 @@
 **  The kernel will then return -ENOTDIR to any application using
 **  the old binary interface.
 **
- **  For new interfaces unless you really need a binary number
- **  please use CTL_UNNUMBERED.
- **
 ****************************************************************
 ****************************************************************
 */
@@ -50,12 +47,6 @@ struct __sysctl_args {
 /* Top-level names: */
-/* For internal pattern-matching use only: */
-#ifdef __KERNEL__
-#define CTL_NONE        0
-#define CTL_UNNUMBERED  CTL_NONE        /* sysctl without a binary number */
-#endif
 enum
 {
        CTL_KERN=1,             /* General kernel info and control */
@@ -490,6 +481,7 @@ enum
        NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
        NET_IPV4_CONF_ARP_ACCEPT=21,
        NET_IPV4_CONF_ARP_NOTIFY=22,
+        NET_IPV4_CONF_ACCEPT_LOCAL=23,
        __NET_IPV4_CONF_MAX
 };
@@ -972,10 +964,6 @@ extern int sysctl_perm(struct ctl_table_root *root,
 typedef struct ctl_table ctl_table;
-typedef int ctl_handler (struct ctl_table *table,
-                         void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen);
 typedef int proc_handler (struct ctl_table *ctl, int write,
                          void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -996,21 +984,10 @@ extern int proc_doulongvec_minmax(struct ctl_table *, int,
 extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int,
                                      void __user *, size_t *, loff_t *);
-extern int do_sysctl (int __user *name, int nlen,
-                      void __user *oldval, size_t __user *oldlenp,
-                      void __user *newval, size_t newlen);
-extern ctl_handler sysctl_data;
-extern ctl_handler sysctl_string;
-extern ctl_handler sysctl_intvec;
-extern ctl_handler sysctl_jiffies;
-extern ctl_handler sysctl_ms_jiffies;
 /*
 * Register a set of sysctl names by calling register_sysctl_table
- * with an initialised array of struct ctl_table's.  An entry with zero
+ * with an initialised array of struct ctl_table's.  An entry with 
- * ctl_name and NULL procname terminates the table.  table->de will be
+ * NULL procname terminates the table.  table->de will be
 * set up by the registration and need not be initialised in advance.
 *
 * sysctl names can be mirrored automatically under /proc/sys.  The
@@ -1023,24 +1000,11 @@ extern ctl_handler sysctl_ms_jiffies;
 * under /proc; non-leaf nodes will be represented by directories.  A
 * null procname disables /proc mirroring at this node.
 *
- * sysctl entries with a zero ctl_name will not be available through
- * the binary sysctl interface.
- *
 * sysctl(2) can automatically manage read and write requests through
 * the sysctl table.  The data and maxlen fields of the ctl_table
 * struct enable minimal validation of the values being written to be
 * performed, and the mode field allows minimal authentication.
 * 
- * More sophisticated management can be enabled by the provision of a
- * strategy routine with the table entry.  This will be called before
- * any automatic read or write of the data is performed.
- * 
- * The strategy routine may return:
- * <0: Error occurred (error is passed to user process)
- * 0:  OK - proceed with automatic read or write.
- * >0: OK - read or write has been done by the strategy routine, so 
- *     return immediately.
- * 
 * There must be a proc_handler routine for any terminal nodes
 * mirrored under /proc/sys (non-terminals are handled by a built-in
 * directory handler).  Several default handlers are available to
@@ -1050,7 +1014,6 @@ extern ctl_handler sysctl_ms_jiffies;
 /* A sysctl table is an array of struct ctl_table: */
 struct ctl_table 
 {
-        int ctl_name;                   /* Binary ID */
        const char *procname;           /* Text ID for /proc/sys, or zero */
        void *data;
        int maxlen;
@@ -1058,7 +1021,6 @@ struct ctl_table
        struct ctl_table *child;
        struct ctl_table *parent;       /* Automatically set */
        proc_handler *proc_handler;     /* Callback for text formatting */
-        ctl_handler *strategy;          /* Callback function for all r/w */
        void *extra1;
        void *extra2;
 };
@@ -1092,7 +1054,6 @@ struct ctl_table_header
 /* struct ctl_path describes where in the hierarchy a table is added */
 struct ctl_path {
        const char *procname;
-        int ctl_name;
 };
 void register_sysctl_root(struct ctl_table_root *root);
diff --git a/include/linux/tc_act/tc_defact.h b/include/linux/tc_act/tc_defact.h
index 964f473af0f0..6f65d07c7ce2 100644
--- a/include/linux/tc_act/tc_defact.h
+++ b/include/linux/tc_act/tc_defact.h
@@ -3,13 +3,11 @@
 #include <linux/pkt_cls.h>
-struct tc_defact
+struct tc_defact {
-{
        tc_gen;
 };
                                                                                
-enum
+enum {
-{
        TCA_DEF_UNSPEC,
        TCA_DEF_TM,
        TCA_DEF_PARMS,
diff --git a/include/linux/tc_act/tc_gact.h b/include/linux/tc_act/tc_gact.h
index e895c0a39629..f7bf94eed510 100644
--- a/include/linux/tc_act/tc_gact.h
+++ b/include/linux/tc_act/tc_gact.h
@@ -5,14 +5,12 @@
 #include <linux/pkt_cls.h>
 #define TCA_ACT_GACT 5
-struct tc_gact
+struct tc_gact {
-{
        tc_gen;
 };
-struct tc_gact_p
+struct tc_gact_p {
-{
 #define PGACT_NONE              0
 #define PGACT_NETRAND           1
 #define PGACT_DETERM            2
@@ -22,8 +20,7 @@ struct tc_gact_p
        int                   paction;
 };
 
-enum
+enum {
-{
        TCA_GACT_UNSPEC,
        TCA_GACT_TM,
        TCA_GACT_PARMS,
diff --git a/include/linux/tc_act/tc_ipt.h b/include/linux/tc_act/tc_ipt.h
index 4b6f7b6c7a79..a2335563d21f 100644
--- a/include/linux/tc_act/tc_ipt.h
+++ b/include/linux/tc_act/tc_ipt.h
@@ -5,8 +5,7 @@
 #define TCA_ACT_IPT 6
-enum
+enum {
-{
        TCA_IPT_UNSPEC,
        TCA_IPT_TABLE,
        TCA_IPT_HOOK,
diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h
index 0a99ab60d610..7561750e8fd6 100644
--- a/include/linux/tc_act/tc_mirred.h
+++ b/include/linux/tc_act/tc_mirred.h
@@ -10,15 +10,13 @@
 #define TCA_INGRESS_REDIR 3  /* packet redirect to INGRESS*/
 #define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */
                                                                                
-struct tc_mirred
+struct tc_mirred {
-{
        tc_gen;
        int                     eaction;   /* one of IN/EGRESS_MIRROR/REDIR */
        __u32                   ifindex;  /* ifindex of egress port */
 };
                                                                                
-enum
+enum {
-{
        TCA_MIRRED_UNSPEC,
        TCA_MIRRED_TM,
        TCA_MIRRED_PARMS,
diff --git a/include/linux/tc_act/tc_nat.h b/include/linux/tc_act/tc_nat.h
index e7cf31e8ba79..6663aeba0b9a 100644
--- a/include/linux/tc_act/tc_nat.h
+++ b/include/linux/tc_act/tc_nat.h
@@ -6,8 +6,7 @@
 #define TCA_ACT_NAT 9
-enum
+enum {
-{
        TCA_NAT_UNSPEC,
        TCA_NAT_PARMS,
        TCA_NAT_TM,
@@ -17,8 +16,7 @@ enum
 #define TCA_NAT_FLAG_EGRESS 1
-struct tc_nat
+struct tc_nat {
-{
        tc_gen;
        __be32 old_addr;
        __be32 new_addr;
diff --git a/include/linux/tc_act/tc_pedit.h b/include/linux/tc_act/tc_pedit.h
index 54ce9064115a..716cfabcd5b2 100644
--- a/include/linux/tc_act/tc_pedit.h
+++ b/include/linux/tc_act/tc_pedit.h
@@ -6,8 +6,7 @@
 #define TCA_ACT_PEDIT 7
-enum
+enum {
-{
        TCA_PEDIT_UNSPEC,
        TCA_PEDIT_TM,
        TCA_PEDIT_PARMS,
@@ -15,8 +14,7 @@ enum
 };
 #define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
                                                                                
-struct tc_pedit_key
+struct tc_pedit_key {
-{
        __u32           mask;  /* AND */
        __u32           val;   /*XOR */
        __u32           off;  /*offset */
@@ -25,8 +23,7 @@ struct tc_pedit_key
        __u32           shift;
 };
                                                                                
-struct tc_pedit_sel
+struct tc_pedit_sel {
-{
        tc_gen;
        unsigned char           nkeys;
        unsigned char           flags;
diff --git a/include/linux/tc_act/tc_skbedit.h b/include/linux/tc_act/tc_skbedit.h
index a14e461a7af7..7a2e910a5f08 100644
--- a/include/linux/tc_act/tc_skbedit.h
+++ b/include/linux/tc_act/tc_skbedit.h
@@ -26,6 +26,7 @@
 #define SKBEDIT_F_PRIORITY              0x1
 #define SKBEDIT_F_QUEUE_MAPPING         0x2
+#define SKBEDIT_F_MARK                  0x4
 struct tc_skbedit {
        tc_gen;
@@ -37,6 +38,7 @@ enum {
        TCA_SKBEDIT_PARMS,
        TCA_SKBEDIT_PRIORITY,
        TCA_SKBEDIT_QUEUE_MAPPING,
+        TCA_SKBEDIT_MARK,
        __TCA_SKBEDIT_MAX
 };
 #define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h
index 38e7f7b25ec2..f34bb1bae083 100644
--- a/include/linux/tc_ematch/tc_em_cmp.h
+++ b/include/linux/tc_ematch/tc_em_cmp.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
-struct tcf_em_cmp
+struct tcf_em_cmp {
-{
        __u32           val;
        __u32           mask;
        __u16           off;
@@ -15,8 +14,7 @@ struct tcf_em_cmp
        __u8            opnd:4;
 };
-enum
+enum {
-{
        TCF_EM_ALIGN_U8  = 1,
        TCF_EM_ALIGN_U16 = 2,
        TCF_EM_ALIGN_U32 = 4
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index dcfb733fa1f6..0864206ec1a3 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
-enum
+enum {
-{
        TCA_EM_META_UNSPEC,
        TCA_EM_META_HDR,
        TCA_EM_META_LVALUE,
@@ -14,8 +13,7 @@ enum
 };
 #define TCA_EM_META_MAX (__TCA_EM_META_MAX - 1)
-struct tcf_meta_val
+struct tcf_meta_val {
-{
        __u16                   kind;
        __u8                    shift;
        __u8                    op;
@@ -26,16 +24,14 @@ struct tcf_meta_val
 #define TCF_META_ID_MASK        0x7ff
 #define TCF_META_ID(kind)       ((kind) & TCF_META_ID_MASK)
-enum
+enum {
-{
        TCF_META_TYPE_VAR,
        TCF_META_TYPE_INT,
        __TCF_META_TYPE_MAX
 };
 #define TCF_META_TYPE_MAX (__TCF_META_TYPE_MAX - 1)
-enum
+enum {
-{
        TCF_META_ID_VALUE,
        TCF_META_ID_RANDOM,
        TCF_META_ID_LOADAVG_0,
@@ -87,8 +83,7 @@ enum
 };
 #define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)
-struct tcf_meta_hdr
+struct tcf_meta_hdr {
-{
        struct tcf_meta_val     left;
        struct tcf_meta_val     right;
 };
diff --git a/include/linux/tc_ematch/tc_em_nbyte.h b/include/linux/tc_ematch/tc_em_nbyte.h
index 9ed8c2e58488..7172cfb999c1 100644
--- a/include/linux/tc_ematch/tc_em_nbyte.h
+++ b/include/linux/tc_ematch/tc_em_nbyte.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
-struct tcf_em_nbyte
+struct tcf_em_nbyte {
-{
        __u16           off;
        __u16           len:12;
        __u8            layer:4;
diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/linux/tc_ematch/tc_em_text.h
index d12a73a225fc..5aac4045ba88 100644
--- a/include/linux/tc_ematch/tc_em_text.h
+++ b/include/linux/tc_ematch/tc_em_text.h
@@ -6,8 +6,7 @@
 #define TC_EM_TEXT_ALGOSIZ      16
-struct tcf_em_text
+struct tcf_em_text {
-{
        char            algo[TC_EM_TEXT_ALGOSIZ];
        __u16           from_offset;
        __u16           to_offset;
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 61723a7c21fe..7fee8a4df931 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -81,6 +81,12 @@ enum {
        TCP_DATA_OFFSET = __cpu_to_be32(0xF0000000)
 }; 
+/*
+ * TCP general constants
+ */
+#define TCP_MSS_DEFAULT          536U   /* IPv4 (RFC1122, RFC2581) */
+#define TCP_MSS_DESIRED         1220U   /* IPv6 (tunneled), EDNS0 (RFC3226) */
 /* TCP socket options */
 #define TCP_NODELAY             1       /* Turn off Nagle's algorithm. */
 #define TCP_MAXSEG              2       /* Limit MSS */
@@ -96,14 +102,15 @@ enum {
 #define TCP_QUICKACK            12      /* Block/reenable quick acks */
 #define TCP_CONGESTION          13      /* Congestion control algorithm */
 #define TCP_MD5SIG              14      /* TCP MD5 Signature (RFC2385) */
+#define TCP_COOKIE_TRANSACTIONS 15      /* TCP Cookie Transactions */
+/* for TCP_INFO socket option */
 #define TCPI_OPT_TIMESTAMPS     1
 #define TCPI_OPT_SACK           2
 #define TCPI_OPT_WSCALE         4
 #define TCPI_OPT_ECN            8
-enum tcp_ca_state
+enum tcp_ca_state {
-{
        TCP_CA_Open = 0,
 #define TCPF_CA_Open    (1<<TCP_CA_Open)
        TCP_CA_Disorder = 1,
@@ -116,8 +123,7 @@ enum tcp_ca_state
 #define TCPF_CA_Loss    (1<<TCP_CA_Loss)
 };
-struct tcp_info
+struct tcp_info {
-{
        __u8    tcpi_state;
        __u8    tcpi_ca_state;
        __u8    tcpi_retransmits;
@@ -170,6 +176,30 @@ struct tcp_md5sig {
        __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
 };
+/* for TCP_COOKIE_TRANSACTIONS (TCPCT) socket option */
+#define TCP_COOKIE_MIN           8              /*  64-bits */
+#define TCP_COOKIE_MAX          16              /* 128-bits */
+#define TCP_COOKIE_PAIR_SIZE    (2*TCP_COOKIE_MAX)
+/* Flags for both getsockopt and setsockopt */
+#define TCP_COOKIE_IN_ALWAYS    (1 << 0)        /* Discard SYN without cookie */
+#define TCP_COOKIE_OUT_NEVER    (1 << 1)        /* Prohibit outgoing cookies,
+                                                 * supercedes everything. */
+/* Flags for getsockopt */
+#define TCP_S_DATA_IN           (1 << 2)        /* Was data received? */
+#define TCP_S_DATA_OUT          (1 << 3)        /* Was data sent? */
+/* TCP_COOKIE_TRANSACTIONS data */
+struct tcp_cookie_transactions {
+        __u16   tcpct_flags;                    /* see above */
+        __u8    __tcpct_pad1;                   /* zero */
+        __u8    tcpct_cookie_desired;           /* bytes */
+        __u16   tcpct_s_data_desired;           /* bytes of variable data */
+        __u16   tcpct_used;                     /* bytes in value */
+        __u8    tcpct_value[TCP_MSS_DEFAULT];
+};
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
@@ -217,26 +247,38 @@ struct tcp_options_received {
                sack_ok : 4,    /* SACK seen on SYN packet              */
                snd_wscale : 4, /* Window scaling received from sender  */
                rcv_wscale : 4; /* Window scaling to send to receiver   */
-/*      SACKs data      */
+        u8      cookie_plus:6,  /* bytes in authenticator/cookie option */
+                cookie_out_never:1,
+                cookie_in_always:1;
        u8      num_sacks;      /* Number of SACK blocks                */
-        u16     user_mss;       /* mss requested by user in ioctl */
+        u16     user_mss;       /* mss requested by user in ioctl       */
        u16     mss_clamp;      /* Maximal mss, negotiated at connection setup */
 };
+static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
+{
+        rx_opt->tstamp_ok = rx_opt->sack_ok = 0;
+        rx_opt->wscale_ok = rx_opt->snd_wscale = 0;
+        rx_opt->cookie_plus = 0;
+}
 /* This is the max number of SACKS that we'll generate and process. It's safe
- * to increse this, although since:
+ * to increase this, although since:
 *   size = TCPOLEN_SACK_BASE_ALIGNED (4) + n * TCPOLEN_SACK_PERBLOCK (8)
 * only four options will fit in a standard TCP header */
 #define TCP_NUM_SACKS 4
+struct tcp_cookie_values;
+struct tcp_request_sock_ops;
 struct tcp_request_sock {
        struct inet_request_sock        req;
 #ifdef CONFIG_TCP_MD5SIG
        /* Only used by TCP MD5 Signature so far. */
        const struct tcp_request_sock_ops *af_specific;
 #endif
-        u32                             rcv_isn;
+        u32                             rcv_isn;
-        u32                             snt_isn;
+        u32                             snt_isn;
 };
 static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
@@ -406,6 +448,12 @@ struct tcp_sock {
 /* TCP MD5 Signature Option information */
        struct tcp_md5sig_info  *md5sig_info;
 #endif
+        /* When the cookie options are generated and exchanged, then this
+         * object holds a reference to them (cookie_values->kref).  Also
+         * contains related tcp_cookie_transactions fields.
+         */
+        struct tcp_cookie_values  *cookie_values;
 };
 static inline struct tcp_sock *tcp_sk(const struct sock *sk)
@@ -424,6 +472,10 @@ struct tcp_timewait_sock {
        u16                       tw_md5_keylen;
        u8                        tw_md5_key[TCP_MD5SIG_MAXKEYLEN];
 #endif
+        /* Few sockets in timewait have cookies; in that case, then this
+         * object holds a reference to them (tw_cookie_values->kref).
+         */
+        struct tcp_cookie_values  *tw_cookie_values;
 };
 static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
@@ -431,6 +483,6 @@ static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
        return (struct tcp_timewait_sock *)sk;
 }
-#endif
+#endif  /* __KERNEL__ */
 #endif  /* _LINUX_TCP_H */
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 0cf5c4c0ec81..03f72a2ba028 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -45,16 +45,19 @@ static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
        return (struct udphdr *)skb_transport_header(skb);
 }
-#define UDP_HTABLE_SIZE         128
+#define UDP_HTABLE_SIZE_MIN             (CONFIG_BASE_SMALL ? 128 : 256)
-static inline int udp_hashfn(struct net *net, const unsigned num)
+static inline int udp_hashfn(struct net *net, unsigned num, unsigned mask)
 {
-        return (num + net_hash_mix(net)) & (UDP_HTABLE_SIZE - 1);
+        return (num + net_hash_mix(net)) & mask;
 }
 struct udp_sock {
        /* inet_sock has to be the first member */
        struct inet_sock inet;
+#define udp_port_hash           inet.sk.__sk_common.skc_u16hashes[0]
+#define udp_portaddr_hash       inet.sk.__sk_common.skc_u16hashes[1]
+#define udp_portaddr_node       inet.sk.__sk_common.skc_portaddr_node
        int              pending;       /* Any pending frames ? */
        unsigned int     corkflag;      /* Cork is required */
        __u16            encap_type;    /* Is this an Encapsulation socket? */
@@ -85,6 +88,12 @@ static inline struct udp_sock *udp_sk(const struct sock *sk)
        return (struct udp_sock *)sk;
 }
+#define udp_portaddr_for_each_entry(__sk, node, list) \
+        hlist_nulls_for_each_entry(__sk, node, list, __sk_common.skc_portaddr_node)
+#define udp_portaddr_for_each_entry_rcu(__sk, node, list) \
+        hlist_nulls_for_each_entry_rcu(__sk, node, list, __sk_common.skc_portaddr_node)
 #define IS_UDPLITE(__sk) (udp_sk(__sk)->pcflag)
 #endif
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index f81473052059..8ce61359bf73 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -55,6 +55,7 @@ struct usbnet {
        struct sk_buff_head     done;
        struct sk_buff_head     rxq_pause;
        struct urb              *interrupt;
+        struct usb_anchor       deferred;
        struct tasklet_struct   bh;
        struct work_struct      kevent;
@@ -65,6 +66,8 @@ struct usbnet {
 #               define EVENT_STS_SPLIT  3
 #               define EVENT_LINK_RESET 4
 #               define EVENT_RX_PAUSED  5
+#               define EVENT_DEV_WAKING 6
+#               define EVENT_DEV_ASLEEP 7
 };
 static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -90,7 +93,9 @@ struct driver_info {
 #define FLAG_WLAN       0x0080          /* use "wlan%d" names */
 #define FLAG_AVOID_UNLINK_URBS 0x0100   /* don't unlink urbs at usbnet_stop() */
 #define FLAG_SEND_ZLP   0x0200          /* hw requires ZLPs are sent */
+#define FLAG_WWAN       0x0400          /* use "wwan%d" names */
+#define FLAG_LINK_INTR  0x0800          /* updates link (carrier) status */
        /* init device ... can sleep, or cause probe() failure */
        int     (*bind)(struct usbnet *, struct usb_interface *);
@@ -107,6 +112,9 @@ struct driver_info {
        /* see if peer is connected ... can sleep */
        int     (*check_connect)(struct usbnet *);
+        /* (dis)activate runtime power management */
+        int     (*manage_power)(struct usbnet *, int);
        /* for status polling */
        void    (*status)(struct usbnet *, struct urb *);
diff --git a/include/linux/user-return-notifier.h b/include/linux/user-return-notifier.h
new file mode 100644
index 000000000000..9c4a445bb43c
--- /dev/null
+++ b/include/linux/user-return-notifier.h
@@ -0,0 +1,49 @@
+#ifndef _LINUX_USER_RETURN_NOTIFIER_H
+#define _LINUX_USER_RETURN_NOTIFIER_H
+#ifdef CONFIG_USER_RETURN_NOTIFIER
+#include <linux/list.h>
+#include <linux/sched.h>
+struct user_return_notifier {
+        void (*on_user_return)(struct user_return_notifier *urn);
+        struct hlist_node link;
+};
+void user_return_notifier_register(struct user_return_notifier *urn);
+void user_return_notifier_unregister(struct user_return_notifier *urn);
+static inline void propagate_user_return_notify(struct task_struct *prev,
+                                                struct task_struct *next)
+{
+        if (test_tsk_thread_flag(prev, TIF_USER_RETURN_NOTIFY)) {
+                clear_tsk_thread_flag(prev, TIF_USER_RETURN_NOTIFY);
+                set_tsk_thread_flag(next, TIF_USER_RETURN_NOTIFY);
+        }
+}
+void fire_user_return_notifiers(void);
+static inline void clear_user_return_notifier(struct task_struct *p)
+{
+        clear_tsk_thread_flag(p, TIF_USER_RETURN_NOTIFY);
+}
+#else
+struct user_return_notifier {};
+static inline void propagate_user_return_notify(struct task_struct *prev,
+                                                struct task_struct *next)
+{
+}
+static inline void fire_user_return_notifiers(void) {}
+static inline void clear_user_return_notifier(struct task_struct *p) {}
+#endif
+#endif
diff --git a/include/linux/wimax/debug.h b/include/linux/wimax/debug.h
index c703e0340423..db8096e88533 100644
--- a/include/linux/wimax/debug.h
+++ b/include/linux/wimax/debug.h
@@ -450,4 +450,76 @@ do {							\
 })
+static inline
+void d_submodule_set(struct d_level *d_level, size_t d_level_size,
+                     const char *submodule, u8 level, const char *tag)
+{
+        struct d_level *itr, *top;
+        int index = -1;
+        for (itr = d_level, top = itr + d_level_size; itr < top; itr++) {
+                index++;
+                if (itr->name == NULL) {
+                        printk(KERN_ERR "%s: itr->name NULL?? (%p, #%d)\n",
+                               tag, itr, index);
+                        continue;
+                }
+                if (!strcmp(itr->name, submodule)) {
+                        itr->level = level;
+                        return;
+                }
+        }
+        printk(KERN_ERR "%s: unknown submodule %s\n", tag, submodule);
+}
+/**
+ * d_parse_params - Parse a string with debug parameters from the
+ * command line
+ *
+ * @d_level: level structure (D_LEVEL)
+ * @d_level_size: number of items in the level structure
+ *     (D_LEVEL_SIZE).
+ * @_params: string with the parameters; this is a space (not tab!)
+ *     separated list of NAME:VALUE, where value is the debug level
+ *     and NAME is the name of the submodule.
+ * @tag: string for error messages (example: MODULE.ARGNAME).
+ */
+static inline
+void d_parse_params(struct d_level *d_level, size_t d_level_size,
+                    const char *_params, const char *tag)
+{
+        char submodule[130], *params, *params_orig, *token, *colon;
+        unsigned level, tokens;
+        if (_params == NULL)
+                return;
+        params_orig = kstrdup(_params, GFP_KERNEL);
+        params = params_orig;
+        while (1) {
+                token = strsep(&params, " ");
+                if (token == NULL)
+                        break;
+                if (*token == '\0')     /* eat joint spaces */
+                        continue;
+                /* kernel's sscanf %s eats until whitespace, so we
+                 * replace : by \n so it doesn't get eaten later by
+                 * strsep */
+                colon = strchr(token, ':');
+                if (colon != NULL)
+                        *colon = '\n';
+                tokens = sscanf(token, "%s\n%u", submodule, &level);
+                if (colon != NULL)
+                        *colon = ':';   /* set back, for error messages */
+                if (tokens == 2)
+                        d_submodule_set(d_level, d_level_size,
+                                        submodule, level, tag);
+                else
+                        printk(KERN_ERR "%s: can't parse '%s' as a "
+                               "SUBMODULE:LEVEL (%d tokens)\n",
+                               tag, token, tokens);
+        }
+        kfree(params_orig);
+}
 #endif /* #ifndef __debug__h__ */
diff --git a/include/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h
index 433693ef2bb0..62d356153565 100644
--- a/include/linux/wimax/i2400m.h
+++ b/include/linux/wimax/i2400m.h
@@ -138,7 +138,7 @@ struct i2400m_bcf_hdr {
        __le32 module_id;
        __le32 module_vendor;
        __le32 date;            /* BCD YYYMMDD */
-        __le32 size;
+        __le32 size;            /* in dwords */
        __le32 key_size;        /* in dwords */
        __le32 modulus_size;    /* in dwords */
        __le32 exponent_size;   /* in dwords */
@@ -168,16 +168,6 @@ enum i2400m_brh {
 };
-/* Constants for bcf->module_id */
-enum i2400m_bcf_mod_id {
-        /* Firmware file carries its own pokes -- pokes are a set of
-         * magical values that have to be written in certain memory
-         * addresses to get the device up and ready for firmware
-         * download when it is in non-signed boot mode. */
-        I2400M_BCF_MOD_ID_POKES = 0x000000001,
-};
 /**
 * i2400m_bootrom_header - Header for a boot-mode command
 *
@@ -276,6 +266,7 @@ enum {
        I2400M_WARM_RESET_BARKER = 0x50f750f7,
        I2400M_NBOOT_BARKER = 0xdeadbeef,
        I2400M_SBOOT_BARKER = 0x0ff1c1a1,
+        I2400M_SBOOT_BARKER_6050 = 0x80000001,
        I2400M_ACK_BARKER = 0xfeedbabe,
        I2400M_D2H_MSG_BARKER = 0xbeefbabe,
 };
diff --git a/include/linux/x25.h b/include/linux/x25.h
index d035e4e87d07..6450a7f12074 100644
--- a/include/linux/x25.h
+++ b/include/linux/x25.h
@@ -25,6 +25,7 @@
 #define SIOCX25SENDCALLACCPT    (SIOCPROTOPRIVATE + 9)
 #define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10)
 #define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11)
+#define SIOCX25SCAUSEDIAG       (SIOCPROTOPRIVATE + 12)
 /*
 *      Values for {get,set}sockopt.
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 2d4ec15abaca..29e04beb1fc9 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -10,8 +10,7 @@
 /* Structure to encapsulate addresses. I do not want to use
 * "standard" structure. My apologies.
 */
-typedef union
+typedef union {
-{
        __be32          a4;
        __be32          a6[4];
 } xfrm_address_t;
@@ -20,8 +19,7 @@ typedef union
 * the state by (spi,daddr,ah/esp) or to store information about
 * spi, protocol and tunnel address on output.
 */
-struct xfrm_id
+struct xfrm_id {
-{
        xfrm_address_t  daddr;
        __be32          spi;
        __u8            proto;
@@ -45,8 +43,7 @@ struct xfrm_sec_ctx {
 /* Selector, used as selector both on policy rules (SPD) and SAs. */
-struct xfrm_selector
+struct xfrm_selector {
-{
        xfrm_address_t  daddr;
        xfrm_address_t  saddr;
        __be16  dport;
@@ -63,8 +60,7 @@ struct xfrm_selector
 #define XFRM_INF (~(__u64)0)
-struct xfrm_lifetime_cfg
+struct xfrm_lifetime_cfg {
-{
        __u64   soft_byte_limit;
        __u64   hard_byte_limit;
        __u64   soft_packet_limit;
@@ -75,16 +71,14 @@ struct xfrm_lifetime_cfg
        __u64   hard_use_expires_seconds;
 };
-struct xfrm_lifetime_cur
+struct xfrm_lifetime_cur {
-{
        __u64   bytes;
        __u64   packets;
        __u64   add_time;
        __u64   use_time;
 };
-struct xfrm_replay_state
+struct xfrm_replay_state {
-{
        __u32   oseq;
        __u32   seq;
        __u32   bitmap;
@@ -96,6 +90,13 @@ struct xfrm_algo {
        char            alg_key[0];
 };
+struct xfrm_algo_auth {
+        char            alg_name[64];
+        unsigned int    alg_key_len;    /* in bits */
+        unsigned int    alg_trunc_len;  /* in bits */
+        char            alg_key[0];
+};
 struct xfrm_algo_aead {
        char            alg_name[64];
        unsigned int    alg_key_len;    /* in bits */
@@ -109,16 +110,14 @@ struct xfrm_stats {
        __u32   integrity_failed;
 };
-enum
+enum {
-{
        XFRM_POLICY_TYPE_MAIN   = 0,
        XFRM_POLICY_TYPE_SUB    = 1,
        XFRM_POLICY_TYPE_MAX    = 2,
        XFRM_POLICY_TYPE_ANY    = 255
 };
-enum
+enum {
-{
        XFRM_POLICY_IN  = 0,
        XFRM_POLICY_OUT = 1,
        XFRM_POLICY_FWD = 2,
@@ -126,8 +125,7 @@ enum
        XFRM_POLICY_MAX = 3
 };
-enum
+enum {
-{
        XFRM_SHARE_ANY,         /* No limitations */
        XFRM_SHARE_SESSION,     /* For this session only */
        XFRM_SHARE_USER,        /* For this user only */
@@ -283,6 +281,7 @@ enum xfrm_attr_type_t {
        XFRMA_MIGRATE,
        XFRMA_ALG_AEAD,         /* struct xfrm_algo_aead */
        XFRMA_KMADDRESS,        /* struct xfrm_user_kmaddress */
+        XFRMA_ALG_AUTH_TRUNC,   /* struct xfrm_algo_auth */
        __XFRMA_MAX
 #define XFRMA_MAX (__XFRMA_MAX - 1)
diff --git a/include/net/ah.h b/include/net/ah.h
index ae1c322f4242..f0129f79a31a 100644
--- a/include/net/ah.h
+++ b/include/net/ah.h
@@ -1,43 +1,20 @@
 #ifndef _NET_AH_H
 #define _NET_AH_H
-#include <linux/crypto.h>
+#include <linux/skbuff.h>
-#include <net/xfrm.h>
 /* This is the maximum truncated ICV length that we know of. */
 #define MAX_AH_AUTH_LEN 12
-struct ah_data
+struct crypto_ahash;
-{
-        u8                      *work_icv;
+struct ah_data {
        int                     icv_full_len;
        int                     icv_trunc_len;
-        struct crypto_hash      *tfm;
+        struct crypto_ahash     *ahash;
 };
-static inline int ah_mac_digest(struct ah_data *ahp, struct sk_buff *skb,
-                                u8 *auth_data)
-{
-        struct hash_desc desc;
-        int err;
-        desc.tfm = ahp->tfm;
-        desc.flags = 0;
-        memset(auth_data, 0, ahp->icv_trunc_len);
-        err = crypto_hash_init(&desc);
-        if (unlikely(err))
-                goto out;
-        err = skb_icv_walk(skb, &desc, 0, skb->len, crypto_hash_update);
-        if (unlikely(err))
-                goto out;
-        err = crypto_hash_final(&desc, ahp->work_icv);
-out:
-        return err;
-}
 struct ip_auth_hdr;
 static inline struct ip_auth_hdr *ip_auth_hdr(const struct sk_buff *skb)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 718394e2c01e..04a6908e38d2 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -121,7 +121,7 @@ struct bt_sock_list {
        rwlock_t          lock;
 };
-int  bt_sock_register(int proto, struct net_proto_family *ops);
+int  bt_sock_register(int proto, const struct net_proto_family *ops);
 int  bt_sock_unregister(int proto);
 void bt_sock_link(struct bt_sock_list *l, struct sock *s);
 void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7b640aeddb64..7b86094a894b 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -367,22 +367,6 @@ static inline void hci_conn_put(struct hci_conn *conn)
        }
 }
-/* ----- HCI tasks ----- */
-static inline void hci_sched_cmd(struct hci_dev *hdev)
-{
-        tasklet_schedule(&hdev->cmd_task);
-}
-static inline void hci_sched_rx(struct hci_dev *hdev)
-{
-        tasklet_schedule(&hdev->rx_task);
-}
-static inline void hci_sched_tx(struct hci_dev *hdev)
-{
-        tasklet_schedule(&hdev->tx_task);
-}
 /* ----- HCI Devices ----- */
 static inline void __hci_dev_put(struct hci_dev *d)
 {
@@ -437,28 +421,7 @@ int hci_inquiry(void __user *arg);
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
-/* Receive frame from HCI drivers */
+int hci_recv_frame(struct sk_buff *skb);
-static inline int hci_recv_frame(struct sk_buff *skb)
-{
-        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
-        if (!hdev || (!test_bit(HCI_UP, &hdev->flags) 
-                        && !test_bit(HCI_INIT, &hdev->flags))) {
-                kfree_skb(skb);
-                return -ENXIO;
-        }
-        /* Incomming skb */
-        bt_cb(skb)->incoming = 1;
-        /* Time stamp */
-        __net_timestamp(skb);
-        /* Queue frame for rx task */
-        skb_queue_tail(&hdev->rx_q, skb);
-        hci_sched_rx(hdev);
-        return 0;
-}
 int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
 int hci_register_sysfs(struct hci_dev *hdev);
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 9516f4b4a3c2..17a689f27a6a 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -324,7 +324,6 @@ struct l2cap_pinfo {
        __u8            next_tx_seq;
        __u8            expected_ack_seq;
-        __u8            req_seq;
        __u8            expected_tx_seq;
        __u8            buffer_seq;
        __u8            buffer_seq_srej;
@@ -375,6 +374,7 @@ struct l2cap_pinfo {
 #define L2CAP_CONN_SEND_PBIT       0x10
 #define L2CAP_CONN_REMOTE_BUSY     0x20
 #define L2CAP_CONN_LOCAL_BUSY      0x40
+#define L2CAP_CONN_REJ_ACT         0x80
 #define __mod_retrans_timer() mod_timer(&l2cap_pi(sk)->retrans_timer, \
                jiffies +  msecs_to_jiffies(L2CAP_DEFAULT_RETRANS_TO));
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 3d874c620219..0884b9a0f778 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -206,10 +206,12 @@ struct ieee80211_supported_band {
 * struct vif_params - describes virtual interface parameters
 * @mesh_id: mesh ID to use
 * @mesh_id_len: length of the mesh ID
+ * @use_4addr: use 4-address frames
 */
 struct vif_params {
       u8 *mesh_id;
       int mesh_id_len;
+       int use_4addr;
 };
 /**
@@ -233,6 +235,35 @@ struct key_params {
 };
 /**
+ * enum survey_info_flags - survey information flags
+ *
+ * Used by the driver to indicate which info in &struct survey_info
+ * it has filled in during the get_survey().
+ */
+enum survey_info_flags {
+        SURVEY_INFO_NOISE_DBM = 1<<0,
+};
+/**
+ * struct survey_info - channel survey response
+ *
+ * Used by dump_survey() to report back per-channel survey information.
+ *
+ * @channel: the channel this survey record reports, mandatory
+ * @filled: bitflag of flags from &enum survey_info_flags
+ * @noise: channel noise in dBm. This and all following fields are
+ *     optional
+ *
+ * This structure can later be expanded with things like
+ * channel duty cycle etc.
+ */
+struct survey_info {
+        struct ieee80211_channel *channel;
+        u32 filled;
+        s8 noise;
+};
+/**
 * struct beacon_parameters - beacon parameters
 *
 * Used to configure the beacon for an interface.
@@ -418,7 +449,7 @@ enum monitor_flags {
 * in during get_station() or dump_station().
 *
 * MPATH_INFO_FRAME_QLEN: @frame_qlen filled
- * MPATH_INFO_DSN: @dsn filled
+ * MPATH_INFO_SN: @sn filled
 * MPATH_INFO_METRIC: @metric filled
 * MPATH_INFO_EXPTIME: @exptime filled
 * MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled
@@ -427,7 +458,7 @@ enum monitor_flags {
 */
 enum mpath_info_flags {
        MPATH_INFO_FRAME_QLEN           = BIT(0),
-        MPATH_INFO_DSN                  = BIT(1),
+        MPATH_INFO_SN                   = BIT(1),
        MPATH_INFO_METRIC               = BIT(2),
        MPATH_INFO_EXPTIME              = BIT(3),
        MPATH_INFO_DISCOVERY_TIMEOUT    = BIT(4),
@@ -442,7 +473,7 @@ enum mpath_info_flags {
 *
 * @filled: bitfield of flags from &enum mpath_info_flags
 * @frame_qlen: number of queued frames for this destination
- * @dsn: destination sequence number
+ * @sn: target sequence number
 * @metric: metric (cost) of this mesh path
 * @exptime: expiration time for the mesh path from now, in msecs
 * @flags: mesh path flags
@@ -456,7 +487,7 @@ enum mpath_info_flags {
 struct mpath_info {
        u32 filled;
        u32 frame_qlen;
-        u32 dsn;
+        u32 sn;
        u32 metric;
        u32 exptime;
        u32 discovery_timeout;
@@ -506,6 +537,7 @@ struct mesh_config {
        u32 dot11MeshHWMPactivePathTimeout;
        u16 dot11MeshHWMPpreqMinInterval;
        u16 dot11MeshHWMPnetDiameterTraversalTime;
+        u8  dot11MeshHWMPRootMode;
 };
 /**
@@ -839,6 +871,19 @@ struct cfg80211_bitrate_mask {
        u32 fixed;   /* fixed bitrate, 0 == not fixed */
        u32 maxrate; /* in kbps, 0 == no limit */
 };
+/**
+ * struct cfg80211_pmksa - PMK Security Association
+ *
+ * This structure is passed to the set/del_pmksa() method for PMKSA
+ * caching.
+ *
+ * @bssid: The AP's BSSID.
+ * @pmkid: The PMK material itself.
+ */
+struct cfg80211_pmksa {
+        u8 *bssid;
+        u8 *pmkid;
+};
 /**
 * struct cfg80211_ops - backend description for wireless configuration
@@ -941,7 +986,16 @@ struct cfg80211_bitrate_mask {
 * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
 *      functions to adjust rfkill hw state
 *
+ * @dump_survey: get site survey information.
+ *
 * @testmode_cmd: run a test mode command
+ *
+ * @set_pmksa: Cache a PMKID for a BSSID. This is mostly useful for fullmac
+ *      devices running firmwares capable of generating the (re) association
+ *      RSN IE. It allows for faster roaming between WPA2 BSSIDs.
+ * @del_pmksa: Delete a cached PMKID.
+ * @flush_pmksa: Flush all cached PMKIDs.
+ *
 */
 struct cfg80211_ops {
        int     (*suspend)(struct wiphy *wiphy);
@@ -1060,6 +1114,15 @@ struct cfg80211_ops {
                                    const u8 *peer,
                                    const struct cfg80211_bitrate_mask *mask);
+        int     (*dump_survey)(struct wiphy *wiphy, struct net_device *netdev,
+                        int idx, struct survey_info *info);
+        int     (*set_pmksa)(struct wiphy *wiphy, struct net_device *netdev,
+                             struct cfg80211_pmksa *pmksa);
+        int     (*del_pmksa)(struct wiphy *wiphy, struct net_device *netdev,
+                             struct cfg80211_pmksa *pmksa);
+        int     (*flush_pmksa)(struct wiphy *wiphy, struct net_device *netdev);
        /* some temporary stuff to finish wext */
        int     (*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev,
                                  bool enabled, int timeout);
@@ -1071,27 +1134,50 @@ struct cfg80211_ops {
 */
 /**
- * struct wiphy - wireless hardware description
+ * enum wiphy_flags - wiphy capability flags
- * @idx: the wiphy index assigned to this item
+ *
- * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ * @WIPHY_FLAG_CUSTOM_REGULATORY:  tells us the driver for this device
- * @custom_regulatory: tells us the driver for this device
 *      has its own custom regulatory domain and cannot identify the
 *      ISO / IEC 3166 alpha2 it belongs to. When this is enabled
 *      we will disregard the first regulatory hint (when the
 *      initiator is %REGDOM_SET_BY_CORE).
- * @strict_regulatory: tells us the driver for this device will ignore
+ * @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will
- *      regulatory domain settings until it gets its own regulatory domain
+ *      ignore regulatory domain settings until it gets its own regulatory
- *      via its regulatory_hint(). After its gets its own regulatory domain
+ *      domain via its regulatory_hint(). After its gets its own regulatory
- *      it will only allow further regulatory domain settings to further
+ *      domain it will only allow further regulatory domain settings to
- *      enhance compliance. For example if channel 13 and 14 are disabled
+ *      further enhance compliance. For example if channel 13 and 14 are
- *      by this regulatory domain no user regulatory domain can enable these
+ *      disabled by this regulatory domain no user regulatory domain can
- *      channels at a later time. This can be used for devices which do not
+ *      enable these channels at a later time. This can be used for devices
- *      have calibration information gauranteed for frequencies or settings
+ *      which do not have calibration information gauranteed for frequencies
- *      outside of its regulatory domain.
+ *      or settings outside of its regulatory domain.
- * @disable_beacon_hints: enable this if your driver needs to ensure that
+ * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
- *      passive scan flags and beaconing flags may not be lifted by cfg80211
+ *      that passive scan flags and beaconing flags may not be lifted by
- *      due to regulatory beacon hints. For more information on beacon
+ *      cfg80211 due to regulatory beacon hints. For more information on beacon
 *      hints read the documenation for regulatory_hint_found_beacon()
+ * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this
+ *      wiphy at all
+ * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled
+ *      by default -- this flag will be set depending on the kernel's default
+ *      on wiphy_new(), but can be changed by the driver if it has a good
+ *      reason to override the default
+ * @WIPHY_FLAG_4ADDR_AP: supports 4addr mode even on AP (with a single station
+ *      on a VLAN interface)
+ * @WIPHY_FLAG_4ADDR_STATION: supports 4addr mode even as a station
+ */
+enum wiphy_flags {
+        WIPHY_FLAG_CUSTOM_REGULATORY    = BIT(0),
+        WIPHY_FLAG_STRICT_REGULATORY    = BIT(1),
+        WIPHY_FLAG_DISABLE_BEACON_HINTS = BIT(2),
+        WIPHY_FLAG_NETNS_OK             = BIT(3),
+        WIPHY_FLAG_PS_ON_BY_DEFAULT     = BIT(4),
+        WIPHY_FLAG_4ADDR_AP             = BIT(5),
+        WIPHY_FLAG_4ADDR_STATION        = BIT(6),
+};
+/**
+ * struct wiphy - wireless hardware description
+ * @idx: the wiphy index assigned to this item
+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
 * @reg_notifier: the driver's regulatory notification callback
 * @regd: the driver's regulatory domain, if one was requested via
 *      the regulatory_hint() API. This can be used by the driver
@@ -1106,11 +1192,6 @@ struct cfg80211_ops {
 *      -1 = fragmentation disabled, only odd values >= 256 used
 * @rts_threshold: RTS threshold (dot11RTSThreshold); -1 = RTS/CTS disabled
 * @net: the network namespace this wiphy currently lives in
- * @netnsok: if set to false, do not allow changing the netns of this
- *      wiphy at all
- * @ps_default: default for powersave, will be set depending on the
- *      kernel's default on wiphy_new(), but can be changed by the
- *      driver if it has a good reason to override the default
 */
 struct wiphy {
        /* assign these fields before you register the wiphy */
@@ -1121,12 +1202,7 @@ struct wiphy {
        /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
        u16 interface_modes;
-        bool custom_regulatory;
+        u32 flags;
-        bool strict_regulatory;
-        bool disable_beacon_hints;
-        bool netnsok;
-        bool ps_default;
        enum cfg80211_signal_type signal_type;
@@ -1142,6 +1218,11 @@ struct wiphy {
        u32 frag_threshold;
        u32 rts_threshold;
+        char fw_version[ETHTOOL_BUSINFO_LEN];
+        u32 hw_version;
+        u8 max_num_pmkids;
        /* If multiple wiphys are registered and you're handed e.g.
         * a regular netdev with assigned ieee80211_ptr, you won't
         * know whether it points to a wiphy your driver has registered
@@ -1171,6 +1252,10 @@ struct wiphy {
        struct net *_net;
 #endif
+#ifdef CONFIG_CFG80211_WEXT
+        const struct iw_handler_def *wext;
+#endif
        char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
 };
@@ -1314,6 +1399,10 @@ struct cfg80211_cached_keys;
 * @ssid_len: (private) Used by the internal configuration code
 * @wext: (private) Used by the internal wireless extensions compat code
 * @wext_bssid: (private) Used by the internal wireless extensions compat code
+ * @use_4addr: indicates 4addr mode is used on this interface, must be
+ *      set by driver (if supported) on add_interface BEFORE registering the
+ *      netdev and may otherwise be used by driver read-only, will be update
+ *      by cfg80211 on change_interface
 */
 struct wireless_dev {
        struct wiphy *wiphy;
@@ -1327,6 +1416,8 @@ struct wireless_dev {
        struct work_struct cleanup_work;
+        bool use_4addr;
        /* currently used for IBSS and SME - might be rearranged later */
        u8 ssid[IEEE80211_MAX_SSID_LEN];
        u8 ssid_len;
@@ -1345,7 +1436,7 @@ struct wireless_dev {
        struct cfg80211_internal_bss *auth_bsses[MAX_AUTH_BSSES];
        struct cfg80211_internal_bss *current_bss; /* associated / joined */
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
        /* wext data */
        struct {
                struct cfg80211_ibss_params ibss;
@@ -1776,6 +1867,18 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
 void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);
 /**
+ * __cfg80211_auth_canceled - notify cfg80211 that authentication was canceled
+ * @dev: network device
+ * @addr: The MAC address of the device with which the authentication timed out
+ *
+ * When a pending authentication had no action yet, the driver may decide
+ * to not send a deauth frame, but in that case must calls this function
+ * to tell cfg80211 about this decision. It is only valid to call this
+ * function within the deauth() callback.
+ */
+void __cfg80211_auth_canceled(struct net_device *dev, const u8 *addr);
+/**
 * cfg80211_send_rx_assoc - notification of processed association
 * @dev: network device
 * @buf: (re)association response frame (header + body)
@@ -1802,30 +1905,45 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr);
 * @dev: network device
 * @buf: deauthentication frame (header + body)
 * @len: length of the frame data
- * @cookie: cookie from ->deauth if called within that callback,
- *      %NULL otherwise
 *
 * This function is called whenever deauthentication has been processed in
 * station mode. This includes both received deauthentication frames and
 * locally generated ones. This function may sleep.
 */
-void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len,
+void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);
-                          void *cookie);
+/**
+ * __cfg80211_send_deauth - notification of processed deauthentication
+ * @dev: network device
+ * @buf: deauthentication frame (header + body)
+ * @len: length of the frame data
+ *
+ * Like cfg80211_send_deauth(), but doesn't take the wdev lock.
+ */
+void __cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);
 /**
 * cfg80211_send_disassoc - notification of processed disassociation
 * @dev: network device
 * @buf: disassociation response frame (header + body)
 * @len: length of the frame data
- * @cookie: cookie from ->disassoc if called within that callback,
- *      %NULL otherwise
 *
 * This function is called whenever disassociation has been processed in
 * station mode. This includes both received disassociation frames and locally
 * generated ones. This function may sleep.
 */
-void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len,
+void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len);
-                            void *cookie);
+/**
+ * __cfg80211_send_disassoc - notification of processed disassociation
+ * @dev: network device
+ * @buf: disassociation response frame (header + body)
+ * @len: length of the frame data
+ *
+ * Like cfg80211_send_disassoc(), but doesn't take the wdev lock.
+ */
+void __cfg80211_send_disassoc(struct net_device *dev, const u8 *buf,
+        size_t len);
 /**
 * cfg80211_michael_mic_failure - notification of Michael MIC failure (TKIP)
diff --git a/include/net/compat.h b/include/net/compat.h
index 7c3002832d05..3c7d4e38fa1d 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -18,6 +18,11 @@ struct compat_msghdr {
        compat_uint_t   msg_flags;
 };
+struct compat_mmsghdr {
+        struct compat_msghdr msg_hdr;
+        compat_uint_t        msg_len;
+};
 struct compat_cmsghdr {
        compat_size_t   cmsg_len;
        compat_int_t    cmsg_level;
@@ -28,13 +33,20 @@ extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *);
 extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
 #else /* defined(CONFIG_COMPAT) */
-#define compat_msghdr   msghdr          /* to avoid compiler warnings */
+/*
+ * To avoid compiler warnings:
+ */
+#define compat_msghdr   msghdr
+#define compat_mmsghdr  mmsghdr
 #endif /* defined(CONFIG_COMPAT) */
 extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);
 extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr *, int);
 extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned);
 extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
+extern asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
+                                           unsigned, unsigned,
+                                           struct timespec __user *);
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h
index cee46821dc53..511a459ec10f 100644
--- a/include/net/dn_dev.h
+++ b/include/net/dn_dev.h
@@ -75,7 +75,6 @@ struct dn_dev_parms {
        unsigned long t3;         /* Default value of t3                */
        int priority;             /* Priority to be a router            */
        char *name;               /* Name for sysctl                    */
-        int ctl_name;             /* Index for sysctl                   */
        int  (*up)(struct net_device *);
        void (*down)(struct net_device *);
        void (*timer3)(struct net_device *, struct dn_ifaddr *ifa);
@@ -97,16 +96,14 @@ struct dn_dev {
        unsigned long uptime;     /* Time device went up in jiffies */
 };
-struct dn_short_packet
+struct dn_short_packet {
-{
        __u8    msgflg;
        __le16 dstnode;
        __le16 srcnode;
        __u8   forward;
 } __attribute__((packed));
-struct dn_long_packet
+struct dn_long_packet {
-{
        __u8   msgflg;
        __u8   d_area;
        __u8   d_subarea;
@@ -122,8 +119,7 @@ struct dn_long_packet
 /*------------------------- DRP - Routing messages ---------------------*/
-struct endnode_hello_message
+struct endnode_hello_message {
-{
        __u8   msgflg;
        __u8   tiver[3];
        __u8   id[6];
@@ -138,8 +134,7 @@ struct endnode_hello_message
        __u8   data[2];
 } __attribute__((packed));
-struct rtnode_hello_message
+struct rtnode_hello_message {
-{
        __u8   msgflg;
        __u8   tiver[3];
        __u8   id[6];
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index c378be7bf960..52da6c3dd50d 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -4,8 +4,7 @@
 /* WARNING: The ordering of these elements must match ordering
 *          of RTA_* rtnetlink attribute numbers.
 */
-struct dn_kern_rta
+struct dn_kern_rta {
-{
        void            *rta_dst;
        void            *rta_src;
        int             *rta_iif;
diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index 96e816b6974d..17d43d2db5ec 100644
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -70,30 +70,26 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int nobl
 /* Data Messages    (data segment/interrupt/link service)               */
-struct nsp_data_seg_msg
+struct nsp_data_seg_msg {
-{
        __u8   msgflg;
        __le16 dstaddr;
        __le16 srcaddr;
 } __attribute__((packed));
-struct nsp_data_opt_msg
+struct nsp_data_opt_msg {
-{
        __le16 acknum;
        __le16 segnum;
        __le16 lsflgs;
 } __attribute__((packed));
-struct nsp_data_opt_msg1
+struct nsp_data_opt_msg1 {
-{
        __le16 acknum;
        __le16 segnum;
 } __attribute__((packed));
 /* Acknowledgment Message (data/other data)                             */
-struct nsp_data_ack_msg
+struct nsp_data_ack_msg {
-{
        __u8   msgflg;
        __le16 dstaddr;
        __le16 srcaddr;
@@ -101,16 +97,14 @@ struct nsp_data_ack_msg
 } __attribute__((packed));
 /* Connect Acknowledgment Message */
-struct  nsp_conn_ack_msg
+struct  nsp_conn_ack_msg {
-{
        __u8 msgflg;
        __le16 dstaddr;
 } __attribute__((packed));
 /* Connect Initiate/Retransmit Initiate/Connect Confirm */
-struct  nsp_conn_init_msg
+struct  nsp_conn_init_msg {
-{
        __u8   msgflg;
 #define NSP_CI      0x18            /* Connect Initiate     */
 #define NSP_RCI     0x68            /* Retrans. Conn Init   */
@@ -126,8 +120,7 @@ struct  nsp_conn_init_msg
 } __attribute__((packed));
 /* Disconnect Initiate/Disconnect Confirm */
-struct  nsp_disconn_init_msg
+struct  nsp_disconn_init_msg {
-{
        __u8   msgflg;
        __le16 dstaddr;
        __le16 srcaddr;
@@ -136,8 +129,7 @@ struct  nsp_disconn_init_msg
-struct  srcobj_fmt
+struct  srcobj_fmt {
-{
        __u8   format;
        __u8   task;
        __le16 grpcode;
diff --git a/include/net/dst.h b/include/net/dst.h
index 5a900ddcf10d..387cb3cfde7e 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -36,8 +36,7 @@
 struct sk_buff;
-struct dst_entry
+struct dst_entry {
-{
        struct rcu_head         rcu_head;
        struct dst_entry        *child;
        struct net_device       *dev;
@@ -111,6 +110,12 @@ dst_metric(const struct dst_entry *dst, int metric)
        return dst->metrics[metric-1];
 }
+static inline u32
+dst_feature(const struct dst_entry *dst, u32 feature)
+{
+        return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
+}
 static inline u32 dst_mtu(const struct dst_entry *dst)
 {
        u32 mtu = dst_metric(dst, RTAX_MTU);
@@ -136,7 +141,7 @@ static inline void set_dst_metric_rtt(struct dst_entry *dst, int metric,
 static inline u32
 dst_allfrag(const struct dst_entry *dst)
 {
-        int ret = dst_metric(dst, RTAX_FEATURES) & RTAX_FEATURE_ALLFRAG;
+        int ret = dst_feature(dst,  RTAX_FEATURE_ALLFRAG);
        /* Yes, _exactly_. This is paranoia. */
        barrier();
        return ret;
@@ -222,11 +227,19 @@ static inline void dst_confirm(struct dst_entry *dst)
                neigh_confirm(dst->neighbour);
 }
-static inline void dst_negative_advice(struct dst_entry **dst_p)
+static inline void dst_negative_advice(struct dst_entry **dst_p,
+                                       struct sock *sk)
 {
        struct dst_entry * dst = *dst_p;
-        if (dst && dst->ops->negative_advice)
+        if (dst && dst->ops->negative_advice) {
                *dst_p = dst->ops->negative_advice(dst);
+                if (dst != *dst_p) {
+                        extern void sk_reset_txq(struct sock *sk);
+                        sk_reset_txq(sk);
+                }
+        }
 }
 static inline void dst_link_failure(struct sk_buff *skb)
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index ca4b2e840078..c07ac9650ebc 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -7,12 +7,11 @@
 #include <net/flow.h>
 #include <net/rtnetlink.h>
-struct fib_rule
+struct fib_rule {
-{
        struct list_head        list;
        atomic_t                refcnt;
-        int                     ifindex;
+        int                     iifindex;
-        char                    ifname[IFNAMSIZ];
+        int                     oifindex;
        u32                     mark;
        u32                     mark_mask;
        u32                     pref;
@@ -21,19 +20,19 @@ struct fib_rule
        u8                      action;
        u32                     target;
        struct fib_rule *       ctarget;
+        char                    iifname[IFNAMSIZ];
+        char                    oifname[IFNAMSIZ];
        struct rcu_head         rcu;
        struct net *            fr_net;
 };
-struct fib_lookup_arg
+struct fib_lookup_arg {
-{
        void                    *lookup_ptr;
        void                    *result;
        struct fib_rule         *rule;
 };
-struct fib_rules_ops
+struct fib_rules_ops {
-{
        int                     family;
        struct list_head        list;
        int                     rule_size;
@@ -67,10 +66,12 @@ struct fib_rules_ops
        struct list_head        rules_list;
        struct module           *owner;
        struct net              *fro_net;
+        struct rcu_head         rcu;
 };
 #define FRA_GENERIC_POLICY \
-        [FRA_IFNAME]    = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
+        [FRA_IIFNAME]   = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
+        [FRA_OIFNAME]   = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
        [FRA_PRIORITY]  = { .type = NLA_U32 }, \
        [FRA_FWMARK]    = { .type = NLA_U32 }, \
        [FRA_FWMASK]    = { .type = NLA_U32 }, \
@@ -102,7 +103,7 @@ static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
        return frh->table;
 }
-extern int fib_rules_register(struct fib_rules_ops *);
+extern struct fib_rules_ops *fib_rules_register(struct fib_rules_ops *, struct net *);
 extern void fib_rules_unregister(struct fib_rules_ops *);
 extern void                     fib_rules_cleanup_ops(struct fib_rules_ops *);
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index c1488553e349..fa157712e982 100644
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -6,8 +6,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/pkt_sched.h>
-struct gnet_dump
+struct gnet_dump {
-{
        spinlock_t *      lock;
        struct sk_buff *  skb;
        struct nlattr *   tail;
@@ -30,6 +29,7 @@ extern int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
 extern int gnet_stats_copy_basic(struct gnet_dump *d,
                                 struct gnet_stats_basic_packed *b);
 extern int gnet_stats_copy_rate_est(struct gnet_dump *d,
+                                    const struct gnet_stats_basic_packed *b,
                                    struct gnet_stats_rate_est *r);
 extern int gnet_stats_copy_queue(struct gnet_dump *d,
                                 struct gnet_stats_queue *q);
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 2a1c06874c42..eb551baafc04 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -13,8 +13,7 @@
 * @list: list entry for linking
 * @family: pointer to family, need not be set before registering
 */
-struct genl_multicast_group
+struct genl_multicast_group {
-{
        struct genl_family      *family;        /* private */
        struct list_head        list;           /* private */
        char                    name[GENL_NAMSIZ];
@@ -35,8 +34,7 @@ struct genl_multicast_group
 * @family_list: family list
 * @mcast_groups: multicast groups list
 */
-struct genl_family
+struct genl_family {
-{
        unsigned int            id;
        unsigned int            hdrsize;
        char                    name[GENL_NAMSIZ];
@@ -58,8 +56,7 @@ struct genl_family
 * @userhdr: user specific header
 * @attrs: netlink attributes
 */
-struct genl_info
+struct genl_info {
-{
        u32                     snd_seq;
        u32                     snd_pid;
        struct nlmsghdr *       nlhdr;
@@ -102,8 +99,7 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net)
 * @done: completion callback for dumps
 * @ops_list: operations list
 */
-struct genl_ops
+struct genl_ops {
-{
        u8                      cmd;
        unsigned int            flags;
        const struct nla_policy *policy;
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 23c3f3d97779..9d3d86aaccbb 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -80,7 +80,7 @@ struct ieee80211_radiotap_header {
                                 * Additional extensions are made
                                 * by setting bit 31.
                                 */
-};
+} __packed;
 /* Name                                 Data type    Units
 * ----                                 ---------    -----
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index 5dc6a61952de..57430555487a 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -74,8 +74,12 @@ static inline int mac_cb_type(struct sk_buff *skb)
 #define IEEE802154_MAC_SCAN_PASSIVE     2
 #define IEEE802154_MAC_SCAN_ORPHAN      3
+struct wpan_phy;
 /*
 * This should be located at net_device->ml_priv
+ *
+ * get_phy should increment the reference counting on returned phy.
+ * Use wpan_wpy_put to put that reference.
 */
 struct ieee802154_mlme_ops {
        int (*assoc_req)(struct net_device *dev,
@@ -94,18 +98,20 @@ struct ieee802154_mlme_ops {
        int (*scan_req)(struct net_device *dev,
                        u8 type, u32 channels, u8 page, u8 duration);
+        struct wpan_phy *(*get_phy)(const struct net_device *dev);
        /*
         * FIXME: these should become the part of PIB/MIB interface.
         * However we still don't have IB interface of any kind
         */
-        u16 (*get_pan_id)(struct net_device *dev);
+        u16 (*get_pan_id)(const struct net_device *dev);
-        u16 (*get_short_addr)(struct net_device *dev);
+        u16 (*get_short_addr)(const struct net_device *dev);
-        u8 (*get_dsn)(struct net_device *dev);
+        u8 (*get_dsn)(const struct net_device *dev);
-        u8 (*get_bsn)(struct net_device *dev);
+        u8 (*get_bsn)(const struct net_device *dev);
 };
 static inline struct ieee802154_mlme_ops *ieee802154_mlme_ops(
-                struct net_device *dev)
+                const struct net_device *dev)
 {
        return dev->ml_priv;
 }
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 38b78132019b..e9d69d198495 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -32,8 +32,7 @@
 #ifdef __KERNEL__
-struct inet6_ifaddr 
+struct inet6_ifaddr {
-{
        struct in6_addr         addr;
        __u32                   prefix_len;
        
@@ -67,8 +66,7 @@ struct inet6_ifaddr
        int                     dead;
 };
-struct ip6_sf_socklist
+struct ip6_sf_socklist {
-{
        unsigned int            sl_max;
        unsigned int            sl_count;
        struct in6_addr         sl_addr[0];
@@ -79,8 +77,7 @@ struct ip6_sf_socklist
 #define IP6_SFBLOCK     10      /* allocate this many at once */
-struct ipv6_mc_socklist
+struct ipv6_mc_socklist {
-{
        struct in6_addr         addr;
        int                     ifindex;
        struct ipv6_mc_socklist *next;
@@ -89,8 +86,7 @@ struct ipv6_mc_socklist
        struct ip6_sf_socklist  *sflist;
 };
-struct ip6_sf_list
+struct ip6_sf_list {
-{
        struct ip6_sf_list      *sf_next;
        struct in6_addr         sf_addr;
        unsigned long           sf_count[2];    /* include/exclude counts */
@@ -105,8 +101,7 @@ struct ip6_sf_list
 #define MAF_NOREPORT            0x08
 #define MAF_GSQUERY             0x10
-struct ifmcaddr6
+struct ifmcaddr6 {
-{
        struct in6_addr         mca_addr;
        struct inet6_dev        *idev;
        struct ifmcaddr6        *next;
@@ -126,15 +121,13 @@ struct ifmcaddr6
 /* Anycast stuff */
-struct ipv6_ac_socklist
+struct ipv6_ac_socklist {
-{
        struct in6_addr         acl_addr;
        int                     acl_ifindex;
        struct ipv6_ac_socklist *acl_next;
 };
-struct ifacaddr6
+struct ifacaddr6 {
-{
        struct in6_addr         aca_addr;
        struct inet6_dev        *aca_idev;
        struct rt6_info         *aca_rt;
@@ -157,8 +150,7 @@ struct ipv6_devstat {
        DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg);
 };
-struct inet6_dev 
+struct inet6_dev {
-{
        struct net_device               *dev;
        struct inet6_ifaddr     *addr_list;
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 22c73a77cd99..92838d3a1ab7 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -46,8 +46,8 @@ static inline int inet6_sk_ehashfn(const struct sock *sk)
        const struct ipv6_pinfo *np = inet6_sk(sk);
        const struct in6_addr *laddr = &np->rcv_saddr;
        const struct in6_addr *faddr = &np->daddr;
-        const __u16 lport = inet->num;
+        const __u16 lport = inet->inet_num;
-        const __be16 fport = inet->dport;
+        const __be16 fport = inet->inet_dport;
        struct net *net = sock_net(sk);
        return inet6_ehashfn(net, laddr, lport, faddr, fport);
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index d522dcf3031a..41cbddd25b70 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -92,8 +92,8 @@ static inline struct net *ib_net(struct inet_bind_bucket *ib)
        return read_pnet(&ib->ib_net);
 }
-#define inet_bind_bucket_for_each(tb, node, head) \
+#define inet_bind_bucket_for_each(tb, pos, head) \
-        hlist_for_each_entry(tb, node, head, node)
+        hlist_for_each_entry(tb, pos, head, node)
 struct inet_bind_hashbucket {
        spinlock_t              lock;
@@ -125,7 +125,7 @@ struct inet_hashinfo {
         */
        struct inet_ehash_bucket        *ehash;
        spinlock_t                      *ehash_locks;
-        unsigned int                    ehash_size;
+        unsigned int                    ehash_mask;
        unsigned int                    ehash_locks_mask;
        /* Ok, let's try this, I give up, we do need a local binding
@@ -158,7 +158,7 @@ static inline struct inet_ehash_bucket *inet_ehash_bucket(
        struct inet_hashinfo *hashinfo,
        unsigned int hash)
 {
-        return &hashinfo->ehash[hash & (hashinfo->ehash_size - 1)];
+        return &hashinfo->ehash[hash & hashinfo->ehash_mask];
 }
 static inline spinlock_t *inet_ehash_lockp(
@@ -241,7 +241,7 @@ static inline int inet_lhashfn(struct net *net, const unsigned short num)
 static inline int inet_sk_listen_hashfn(const struct sock *sk)
 {
-        return inet_lhashfn(sock_net(sk), inet_sk(sk)->num);
+        return inet_lhashfn(sock_net(sk), inet_sk(sk)->inet_num);
 }
 /* Caller must disable local BH processing. */
@@ -301,8 +301,8 @@ typedef __u64 __bitwise __addrpair;
 #endif /* __BIG_ENDIAN */
 #define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
-         ((*((__addrpair *)&(inet_sk(__sk)->daddr))) == (__cookie))     &&      \
+         ((*((__addrpair *)&(inet_sk(__sk)->inet_daddr))) == (__cookie))  &&    \
-         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      &&      \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports))   &&    \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #define INET_TW_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
@@ -313,9 +313,9 @@ typedef __u64 __bitwise __addrpair;
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr)
 #define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)     \
        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))       &&      \
-         (inet_sk(__sk)->daddr          == (__saddr))           &&      \
+         (inet_sk(__sk)->inet_daddr     == (__saddr))           &&      \
-         (inet_sk(__sk)->rcv_saddr      == (__daddr))           &&      \
+         (inet_sk(__sk)->inet_rcv_saddr == (__daddr))           &&      \
-         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      &&      \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports)) &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #define INET_TW_MATCH(__sk, __net, __hash,__cookie, __saddr, __daddr, __ports, __dif)   \
        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))       &&      \
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 47004f35cc7e..bd4c53f75ac0 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -93,14 +93,14 @@ struct rtable;
 *
 * @sk - ancestor class
 * @pinet6 - pointer to IPv6 control block
- * @daddr - Foreign IPv4 addr
+ * @inet_daddr - Foreign IPv4 addr
- * @rcv_saddr - Bound local IPv4 addr
+ * @inet_rcv_saddr - Bound local IPv4 addr
- * @dport - Destination port
+ * @inet_dport - Destination port
- * @num - Local port
+ * @inet_num - Local port
- * @saddr - Sending source
+ * @inet_saddr - Sending source
 * @uc_ttl - Unicast TTL
- * @sport - Source port
+ * @inet_sport - Source port
- * @id - ID counter for DF pkts
+ * @inet_id - ID counter for DF pkts
 * @tos - TOS
 * @mc_ttl - Multicasting TTL
 * @is_icsk - is this an inet_connection_sock?
@@ -115,16 +115,16 @@ struct inet_sock {
        struct ipv6_pinfo       *pinet6;
 #endif
        /* Socket demultiplex comparisons on incoming packets. */
-        __be32                  daddr;
+        __be32                  inet_daddr;
-        __be32                  rcv_saddr;
+        __be32                  inet_rcv_saddr;
-        __be16                  dport;
+        __be16                  inet_dport;
-        __u16                   num;
+        __u16                   inet_num;
-        __be32                  saddr;
+        __be32                  inet_saddr;
        __s16                   uc_ttl;
        __u16                   cmsg_flags;
        struct ip_options       *opt;
-        __be16                  sport;
+        __be16                  inet_sport;
-        __u16                   id;
+        __u16                   inet_id;
        __u8                    tos;
        __u8                    mc_ttl;
        __u8                    pmtudisc;
@@ -190,10 +190,10 @@ static inline unsigned int inet_ehashfn(struct net *net,
 static inline int inet_sk_ehashfn(const struct sock *sk)
 {
        const struct inet_sock *inet = inet_sk(sk);
-        const __be32 laddr = inet->rcv_saddr;
+        const __be32 laddr = inet->inet_rcv_saddr;
-        const __u16 lport = inet->num;
+        const __u16 lport = inet->inet_num;
-        const __be32 faddr = inet->daddr;
+        const __be32 faddr = inet->inet_daddr;
-        const __be16 fport = inet->dport;
+        const __be16 fport = inet->inet_dport;
        struct net *net = sock_net(sk);
        return inet_ehashfn(net, laddr, lport, faddr, fport);
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index f93ad90a601b..b801ade2295e 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -194,11 +194,13 @@ static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk)
 static inline __be32 inet_rcv_saddr(const struct sock *sk)
 {
        return likely(sk->sk_state != TCP_TIME_WAIT) ?
-                inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;
+                inet_sk(sk)->inet_rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;
 }
 extern void inet_twsk_put(struct inet_timewait_sock *tw);
+extern int inet_twsk_unhash(struct inet_timewait_sock *tw);
 extern struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,
                                                  const int state);
@@ -212,14 +214,14 @@ extern void inet_twsk_schedule(struct inet_timewait_sock *tw,
 extern void inet_twsk_deschedule(struct inet_timewait_sock *tw,
                                 struct inet_timewait_death_row *twdr);
-extern void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo,
+extern void inet_twsk_purge(struct inet_hashinfo *hashinfo,
                            struct inet_timewait_death_row *twdr, int family);
 static inline
 struct net *twsk_net(const struct inet_timewait_sock *twsk)
 {
 #ifdef CONFIG_NET_NS
-        return twsk->tw_net;
+        return rcu_dereference(twsk->tw_net);
 #else
        return &init_net;
 #endif
@@ -229,7 +231,7 @@ static inline
 void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)
 {
 #ifdef CONFIG_NET_NS
-        twsk->tw_net = net;
+        rcu_assign_pointer(twsk->tw_net, net);
 #endif
 }
 #endif  /* _INET_TIMEWAIT_SOCK_ */
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 15e1f8fe4c1f..87b1df0d4d8c 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -13,20 +13,19 @@
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
-struct inet_peer
+struct inet_peer {
-{
        /* group together avl_left,avl_right,v4daddr to speedup lookups */
        struct inet_peer        *avl_left, *avl_right;
        __be32                  v4daddr;        /* peer's address */
-        __u16                   avl_height;
+        __u32                   avl_height;
-        __u16                   ip_id_count;    /* IP ID for the next packet */
        struct list_head        unused;
        __u32                   dtime;          /* the time of last use of not
                                                 * referenced entries */
        atomic_t                refcnt;
        atomic_t                rid;            /* Frag reception counter */
+        atomic_t                ip_id_count;    /* IP ID for the next packet */
        __u32                   tcp_ts;
-        unsigned long           tcp_ts_stamp;
+        __u32                   tcp_ts_stamp;
 };
 void                    inet_initpeers(void) __init;
@@ -37,17 +36,11 @@ struct inet_peer	*inet_getpeer(__be32 daddr, int create);
 /* can be called from BH context or outside */
 extern void inet_putpeer(struct inet_peer *p);
-extern spinlock_t inet_peer_idlock;
 /* can be called with or without local BH being disabled */
 static inline __u16     inet_getid(struct inet_peer *p, int more)
 {
-        __u16 id;
+        more++;
+        return atomic_add_return(more, &p->ip_id_count) - more;
-        spin_lock_bh(&inet_peer_idlock);
-        id = p->ip_id_count;
-        p->ip_id_count += 1 + more;
-        spin_unlock_bh(&inet_peer_idlock);
-        return id;
 }
 #endif /* _NET_INETPEER_H */
diff --git a/include/net/ip.h b/include/net/ip.h
index 2f47e5482b55..e6b9d12d5f62 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -33,8 +33,7 @@
 struct sock;
-struct inet_skb_parm
+struct inet_skb_parm {
-{
        struct ip_options       opt;            /* Compiled IP options          */
        unsigned char           flags;
@@ -50,8 +49,7 @@ static inline unsigned int ip_hdrlen(const struct sk_buff *skb)
        return ip_hdr(skb)->ihl * 4;
 }
-struct ipcm_cookie
+struct ipcm_cookie {
-{
        __be32                  addr;
        int                     oif;
        struct ip_options       *opt;
@@ -60,8 +58,7 @@ struct ipcm_cookie
 #define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))
-struct ip_ra_chain
+struct ip_ra_chain {
-{
        struct ip_ra_chain      *next;
        struct sock             *sk;
        void                    (*destructor)(struct sock *);
@@ -159,8 +156,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
 void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
                   unsigned int len); 
-struct ipv4_config
+struct ipv4_config {
-{
        int     log_martians;
        int     no_pmtu_disc;
 };
@@ -240,8 +236,8 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str
                 * does not change, they drop every other packet in
                 * a TCP stream using header compression.
                 */
-                iph->id = (sk && inet_sk(sk)->daddr) ?
+                iph->id = (sk && inet_sk(sk)->inet_daddr) ?
-                                        htons(inet_sk(sk)->id++) : 0;
+                                        htons(inet_sk(sk)->inet_id++) : 0;
        } else
                __ip_select_ident(iph, dst, 0);
 }
@@ -249,9 +245,9 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str
 static inline void ip_select_ident_more(struct iphdr *iph, struct dst_entry *dst, struct sock *sk, int more)
 {
        if (iph->frag_off & htons(IP_DF)) {
-                if (sk && inet_sk(sk)->daddr) {
+                if (sk && inet_sk(sk)->inet_daddr) {
-                        iph->id = htons(inet_sk(sk)->id);
+                        iph->id = htons(inet_sk(sk)->inet_id);
-                        inet_sk(sk)->id += 1 + more;
+                        inet_sk(sk)->inet_id += 1 + more;
                } else
                        iph->id = 0;
        } else
@@ -317,7 +313,7 @@ static inline void ip_ib_mc_map(__be32 naddr, const unsigned char *broadcast, ch
 static __inline__ void inet_reset_saddr(struct sock *sk)
 {
-        inet_sk(sk)->rcv_saddr = inet_sk(sk)->saddr = 0;
+        inet_sk(sk)->inet_rcv_saddr = inet_sk(sk)->inet_saddr = 0;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        if (sk->sk_family == PF_INET6) {
                struct ipv6_pinfo *np = inet6_sk(sk);
@@ -336,8 +332,7 @@ extern int	ip_call_ra_chain(struct sk_buff *skb);
 *      Functions provided by ip_fragment.c
 */
-enum ip_defrag_users
+enum ip_defrag_users {
-{
        IP_DEFRAG_LOCAL_DELIVER,
        IP_DEFRAG_CALL_RA_CHAIN,
        IP_DEFRAG_CONNTRACK_IN,
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 15b492a9aa79..257808188add 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -30,8 +30,7 @@
 struct rt6_info;
-struct fib6_config
+struct fib6_config {
-{
        u32             fc_table;
        u32             fc_metric;
        int             fc_dst_len;
@@ -51,8 +50,7 @@ struct fib6_config
        struct nl_info  fc_nlinfo;
 };
-struct fib6_node
+struct fib6_node {
-{
        struct fib6_node        *parent;
        struct fib6_node        *left;
        struct fib6_node        *right;
@@ -78,16 +76,14 @@ struct fib6_node
 *
 */
-struct rt6key
+struct rt6key {
-{
        struct in6_addr addr;
        int             plen;
 };
 struct fib6_table;
-struct rt6_info
+struct rt6_info {
-{
        union {
                struct dst_entry        dst;
        } u;
@@ -127,8 +123,7 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
        return ((struct rt6_info *)dst)->rt6i_idev;
 }
-struct fib6_walker_t
+struct fib6_walker_t {
-{
        struct fib6_walker_t *prev, *next;
        struct fib6_node *root, *node;
        struct rt6_info *leaf;
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 0e1b8aebaff8..4a808de7c0f6 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -103,8 +103,7 @@ extern void			rt6_pmtu_discovery(struct in6_addr *daddr,
 struct netlink_callback;
-struct rt6_rtnl_dump_arg
+struct rt6_rtnl_dump_arg {
-{
        struct sk_buff *skb;
        struct netlink_callback *cb;
        struct net *net;
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 4d22fabc7719..c93f94edc610 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -144,18 +144,21 @@ struct fib_table {
        struct hlist_node tb_hlist;
        u32             tb_id;
        int             tb_default;
-        int             (*tb_lookup)(struct fib_table *tb, const struct flowi *flp, struct fib_result *res);
-        int             (*tb_insert)(struct fib_table *, struct fib_config *);
-        int             (*tb_delete)(struct fib_table *, struct fib_config *);
-        int             (*tb_dump)(struct fib_table *table, struct sk_buff *skb,
-                                     struct netlink_callback *cb);
-        int             (*tb_flush)(struct fib_table *table);
-        void            (*tb_select_default)(struct fib_table *table,
-                                             const struct flowi *flp, struct fib_result *res);
        unsigned char   tb_data[0];
 };
+extern int fib_table_lookup(struct fib_table *tb, const struct flowi *flp,
+                            struct fib_result *res);
+extern int fib_table_insert(struct fib_table *, struct fib_config *);
+extern int fib_table_delete(struct fib_table *, struct fib_config *);
+extern int fib_table_dump(struct fib_table *table, struct sk_buff *skb,
+                          struct netlink_callback *cb);
+extern int fib_table_flush(struct fib_table *table);
+extern void fib_table_select_default(struct fib_table *table,
+                                     const struct flowi *flp,
+                                     struct fib_result *res);
 #ifndef CONFIG_IP_MULTIPLE_TABLES
 #define TABLE_LOCAL_INDEX       0
@@ -182,11 +185,11 @@ static inline int fib_lookup(struct net *net, const struct flowi *flp,
        struct fib_table *table;
        table = fib_get_table(net, RT_TABLE_LOCAL);
-        if (!table->tb_lookup(table, flp, res))
+        if (!fib_table_lookup(table, flp, res))
                return 0;
        table = fib_get_table(net, RT_TABLE_MAIN);
-        if (!table->tb_lookup(table, flp, res))
+        if (!fib_table_lookup(table, flp, res))
                return 0;
        return -ENETUNREACH;
 }
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 98978e73f666..8dc3296b7bea 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -251,8 +251,7 @@ struct ip_vs_estimator {
        u32                     outbps;
 };
-struct ip_vs_stats
+struct ip_vs_stats {
-{
        struct ip_vs_stats_user ustats;         /* statistics */
        struct ip_vs_estimator  est;            /* estimator */
@@ -518,8 +517,7 @@ struct ip_vs_scheduler {
 /*
 *      The application module object (a.k.a. app incarnation)
 */
-struct ip_vs_app
+struct ip_vs_app {
-{
        struct list_head        a_list;         /* member in app list */
        int                     type;           /* IP_VS_APP_TYPE_xxx */
        char                    *name;          /* application module name */
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 87acf8f3a155..11e8513d2d07 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -7,8 +7,15 @@
 /* Keep error state on tunnel for 30 sec */
 #define IPTUNNEL_ERR_TIMEO      (30*HZ)
-struct ip_tunnel
+/* 6rd prefix/relay information */
-{
+struct ip_tunnel_6rd_parm {
+        struct in6_addr         prefix;
+        __be32                  relay_prefix;
+        u16                     prefixlen;
+        u16                     relay_prefixlen;
+};
+struct ip_tunnel {
        struct ip_tunnel        *next;
        struct net_device       *dev;
@@ -23,15 +30,19 @@ struct ip_tunnel
        struct ip_tunnel_parm   parms;
+        /* for SIT */
+#ifdef CONFIG_IPV6_SIT_6RD
+        struct ip_tunnel_6rd_parm       ip6rd;
+#endif
        struct ip_tunnel_prl_entry      *prl;           /* potential router list */
        unsigned int                    prl_count;      /* # of entries in PRL */
 };
-struct ip_tunnel_prl_entry
+struct ip_tunnel_prl_entry {
-{
        struct ip_tunnel_prl_entry      *next;
        __be32                          addr;
        u16                             flags;
+        struct rcu_head                 rcu_head;
 };
 #define IPTUNNEL_XMIT() do {                                            \
@@ -42,9 +53,9 @@ struct ip_tunnel_prl_entry
        ip_select_ident(iph, &rt->u.dst, NULL);                         \
                                                                        \
        err = ip_local_out(skb);                                        \
-        if (net_xmit_eval(err) == 0) {                                  \
+        if (likely(net_xmit_eval(err) == 0)) {                          \
-                stats->tx_bytes += pkt_len;                             \
+                txq->tx_bytes += pkt_len;                               \
-                stats->tx_packets++;                                    \
+                txq->tx_packets++;                                      \
        } else {                                                        \
                stats->tx_errors++;                                     \
                stats->tx_aborted_errors++;                             \
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 8c31d8a0c1fe..92db8617d188 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -160,8 +160,7 @@ extern struct ctl_path net_ipv6_ctl_path[];
 #define ICMP6MSGIN_INC_STATS_BH(net, idev, field)       \
        _DEVINC(net, icmpv6msg, _BH, idev, field)
-struct ip6_ra_chain
+struct ip6_ra_chain {
-{
        struct ip6_ra_chain     *next;
        struct sock             *sk;
        int                     sel;
@@ -176,8 +175,7 @@ extern rwlock_t ip6_ra_lock;
   ancillary data and passed to IPv6.
 */
-struct ipv6_txoptions
+struct ipv6_txoptions {
-{
        /* Length of this structure */
        int                     tot_len;
@@ -194,8 +192,7 @@ struct ipv6_txoptions
        /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */
 };
-struct ip6_flowlabel
+struct ip6_flowlabel {
-{
        struct ip6_flowlabel    *next;
        __be32                  label;
        atomic_t                users;
@@ -212,8 +209,7 @@ struct ip6_flowlabel
 #define IPV6_FLOWINFO_MASK      cpu_to_be32(0x0FFFFFFF)
 #define IPV6_FLOWLABEL_MASK     cpu_to_be32(0x000FFFFF)
-struct ipv6_fl_socklist
+struct ipv6_fl_socklist {
-{
        struct ipv6_fl_socklist *next;
        struct ip6_flowlabel    *fl;
 };
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index e9054a283fde..b2b98f3fa265 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -300,8 +300,7 @@
 * This struct is also my long term insurance. I can add new fields here
 * without breaking the prototype of iw_handler...
 */
-struct iw_request_info
+struct iw_request_info {
-{
        __u16           cmd;            /* Wireless Extension command */
        __u16           flags;          /* More to come ;-) */
 };
@@ -321,20 +320,20 @@ typedef int (*iw_handler)(struct net_device *dev, struct iw_request_info *info,
 * shared by all driver instances... Same for the members...
 * This will be linked from net_device in <linux/netdevice.h>
 */
-struct iw_handler_def
+struct iw_handler_def {
-{
-        /* Number of handlers defined (more precisely, index of the
-         * last defined handler + 1) */
-        __u16                   num_standard;
-        __u16                   num_private;
-        /* Number of private arg description */
-        __u16                   num_private_args;
        /* Array of handlers for standard ioctls
         * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT]
         */
        const iw_handler *      standard;
+        /* Number of handlers defined (more precisely, index of the
+         * last defined handler + 1) */
+        __u16                   num_standard;
+#ifdef CONFIG_WEXT_PRIV
+        __u16                   num_private;
+        /* Number of private arg description */
+        __u16                   num_private_args;
        /* Array of handlers for private ioctls
         * Will call dev->wireless_handlers->private[ioctl - SIOCIWFIRSTPRIV]
         */
@@ -344,6 +343,7 @@ struct iw_handler_def
         * can put it in any order you want and should not leave holes...
         * We will automatically export that to user space... */
        const struct iw_priv_args *     private_args;
+#endif
        /* New location of get_wireless_stats, to de-bloat struct net_device.
         * The old pointer in struct net_device will be gradually phased
@@ -370,8 +370,7 @@ struct iw_handler_def
 /*
 * Describe how a standard IOCTL looks like.
 */
-struct iw_ioctl_description
+struct iw_ioctl_description {
-{
        __u8    header_type;            /* NULL, iw_point or other */
        __u8    token_type;             /* Future */
        __u16   token_size;             /* Granularity of payload */
@@ -393,8 +392,7 @@ struct iw_ioctl_description
 /*
 * Instance specific spy data, i.e. addresses spied and quality for them.
 */
-struct iw_spy_data
+struct iw_spy_data {
-{
        /* --- Standard spy support --- */
        int                     spy_number;
        u_char                  spy_address[IW_MAX_SPY][ETH_ALEN];
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 998c30fc8981..2aff4906b2ae 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -219,7 +219,7 @@ struct ieee80211_bss_conf {
 *
 * These flags are used with the @flags member of &ieee80211_tx_info.
 *
- * @IEEE80211_TX_CTL_REQ_TX_STATUS: request TX status callback for this frame.
+ * @IEEE80211_TX_CTL_REQ_TX_STATUS: require TX status callback for this frame.
 * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
 *      number to this frame, taking care of not overwriting the fragment
 *      number and increasing the sequence number only when the
@@ -390,10 +390,12 @@ struct ieee80211_tx_rate {
 * @control: union for control data
 * @status: union for status data
 * @driver_data: array of driver_data pointers
- * @ampdu_ack_len: number of aggregated frames.
+ * @ampdu_ack_len: number of acked aggregated frames.
 *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
 * @ampdu_ack_map: block ack bit map for the aggregation.
 *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
+ * @ampdu_len: number of aggregated frames.
+ *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
 * @ack_signal: signal strength of the ACK frame
 */
 struct ieee80211_tx_info {
@@ -428,7 +430,8 @@ struct ieee80211_tx_info {
                        u8 ampdu_ack_len;
                        u64 ampdu_ack_map;
                        int ack_signal;
-                        /* 8 bytes free */
+                        u8 ampdu_len;
+                        /* 7 bytes free */
                } status;
                struct {
                        struct ieee80211_tx_rate driver_rates[
@@ -494,7 +497,6 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
 * @RX_FLAG_MMIC_ERROR: Michael MIC error was reported on this frame.
 *      Use together with %RX_FLAG_MMIC_STRIPPED.
 * @RX_FLAG_DECRYPTED: This frame was decrypted in hardware.
- * @RX_FLAG_RADIOTAP: This frame starts with a radiotap header.
 * @RX_FLAG_MMIC_STRIPPED: the Michael MIC is stripped off this frame,
 *      verification has been done by the hardware.
 * @RX_FLAG_IV_STRIPPED: The IV/ICV are stripped from this frame.
@@ -511,11 +513,13 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
 * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
 * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
 * @RX_FLAG_SHORT_GI: Short guard interval was used
+ * @RX_FLAG_INTERNAL_CMTR: set internally after frame was reported
+ *      on cooked monitor to avoid double-reporting it for multiple
+ *      virtual interfaces
 */
 enum mac80211_rx_flags {
        RX_FLAG_MMIC_ERROR      = 1<<0,
        RX_FLAG_DECRYPTED       = 1<<1,
-        RX_FLAG_RADIOTAP        = 1<<2,
        RX_FLAG_MMIC_STRIPPED   = 1<<3,
        RX_FLAG_IV_STRIPPED     = 1<<4,
        RX_FLAG_FAILED_FCS_CRC  = 1<<5,
@@ -525,6 +529,7 @@ enum mac80211_rx_flags {
        RX_FLAG_HT              = 1<<9,
        RX_FLAG_40MHZ           = 1<<10,
        RX_FLAG_SHORT_GI        = 1<<11,
+        RX_FLAG_INTERNAL_CMTR   = 1<<12,
 };
 /**
@@ -554,7 +559,7 @@ struct ieee80211_rx_status {
        int freq;
        int signal;
        int noise;
-        int qual;
+        int __deprecated qual;
        int antenna;
        int rate_idx;
        int flag;
@@ -565,7 +570,9 @@ struct ieee80211_rx_status {
 *
 * Flags to define PHY configuration options
 *
- * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
+ * @IEEE80211_CONF_MONITOR: there's a monitor interface present -- use this
+ *      to determine for example whether to calculate timestamps for packets
+ *      or not, do not use instead of filter flags!
 * @IEEE80211_CONF_PS: Enable 802.11 power save mode (managed mode only)
 * @IEEE80211_CONF_IDLE: The device is running, but idle; if the flag is set
 *      the driver should be prepared to handle configuration requests but
@@ -574,7 +581,7 @@ struct ieee80211_rx_status {
 *      it can also be unset in that case when monitor interfaces are active.
 */
 enum ieee80211_conf_flags {
-        IEEE80211_CONF_RADIOTAP         = (1<<0),
+        IEEE80211_CONF_MONITOR          = (1<<0),
        IEEE80211_CONF_PS               = (1<<1),
        IEEE80211_CONF_IDLE             = (1<<2),
 };
@@ -584,7 +591,7 @@ enum ieee80211_conf_flags {
 * enum ieee80211_conf_changed - denotes which configuration changed
 *
 * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
- * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
+ * @IEEE80211_CONF_CHANGE_MONITOR: the monitor flag changed
 * @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed
 * @IEEE80211_CONF_CHANGE_POWER: the TX power changed
 * @IEEE80211_CONF_CHANGE_CHANNEL: the channel/channel_type changed
@@ -593,7 +600,7 @@ enum ieee80211_conf_flags {
 */
 enum ieee80211_conf_changed {
        IEEE80211_CONF_CHANGE_LISTEN_INTERVAL   = BIT(2),
-        IEEE80211_CONF_CHANGE_RADIOTAP          = BIT(3),
+        IEEE80211_CONF_CHANGE_MONITOR           = BIT(3),
        IEEE80211_CONF_CHANGE_PS                = BIT(4),
        IEEE80211_CONF_CHANGE_POWER             = BIT(5),
        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
@@ -852,6 +859,19 @@ enum ieee80211_tkip_key_type {
 * any particular flags. There are some exceptions to this rule,
 * however, so you are advised to review these flags carefully.
 *
+ * @IEEE80211_HW_HAS_RATE_CONTROL:
+ *      The hardware or firmware includes rate control, and cannot be
+ *      controlled by the stack. As such, no rate control algorithm
+ *      should be instantiated, and the TX rate reported to userspace
+ *      will be taken from the TX status instead of the rate control
+ *      algorithm.
+ *      Note that this requires that the driver implement a number of
+ *      callbacks so it has the correct information, it needs to have
+ *      the @set_rts_threshold callback and must look at the BSS config
+ *      @use_cts_prot for G/N protection, @use_short_slot for slot
+ *      timing in 2.4 GHz and @use_short_preamble for preambles for
+ *      CCK frames.
+ *
 * @IEEE80211_HW_RX_INCLUDES_FCS:
 *      Indicates that received frames passed to the stack include
 *      the FCS at the end.
@@ -910,6 +930,7 @@ enum ieee80211_tkip_key_type {
 *      avoid waking up cpu.
 */
 enum ieee80211_hw_flags {
+        IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
        IEEE80211_HW_RX_INCLUDES_FCS                    = 1<<1,
        IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING        = 1<<2,
        IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE          = 1<<3,
@@ -1511,6 +1532,7 @@ struct ieee80211_ops {
        void (*reset_tsf)(struct ieee80211_hw *hw);
        int (*tx_last_beacon)(struct ieee80211_hw *hw);
        int (*ampdu_action)(struct ieee80211_hw *hw,
+                            struct ieee80211_vif *vif,
                            enum ieee80211_ampdu_mlme_action action,
                            struct ieee80211_sta *sta, u16 tid, u16 *ssn);
@@ -1667,15 +1689,14 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);
 * ieee80211_rx - receive frame
 *
 * Use this function to hand received frames to mac80211. The receive
- * buffer in @skb must start with an IEEE 802.11 header or a radiotap
+ * buffer in @skb must start with an IEEE 802.11 header.
- * header if %RX_FLAG_RADIOTAP is set in the @status flags.
 *
 * This function may not be called in IRQ context. Calls to this function
- * for a single hardware must be synchronized against each other. Calls
+ * for a single hardware must be synchronized against each other. Calls to
- * to this function and ieee80211_rx_irqsafe() may not be mixed for a
+ * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
- * single hardware.
+ * mixed for a single hardware.
 *
- * Note that right now, this function must be called with softirqs disabled.
+ * In process context use instead ieee80211_rx_ni().
 *
 * @hw: the hardware this frame came in on
 * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1688,8 +1709,8 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
 * Like ieee80211_rx() but can be called in IRQ context
 * (internally defers to a tasklet.)
 *
- * Calls to this function and ieee80211_rx() may not be mixed for a
+ * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not
- * single hardware.
+ * be mixed for a single hardware.
 *
 * @hw: the hardware this frame came in on
 * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1697,6 +1718,26 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
 void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb);
 /**
+ * ieee80211_rx_ni - receive frame (in process context)
+ *
+ * Like ieee80211_rx() but can be called in process context
+ * (internally disables bottom halves).
+ *
+ * Calls to this function, ieee80211_rx() and ieee80211_rx_irqsafe() may
+ * not be mixed for a single hardware.
+ *
+ * @hw: the hardware this frame came in on
+ * @skb: the buffer to receive, owned by mac80211 after this call
+ */
+static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
+                                   struct sk_buff *skb)
+{
+        local_bh_disable();
+        ieee80211_rx(hw, skb);
+        local_bh_enable();
+}
+/**
 * ieee80211_tx_status - transmit status callback
 *
 * Call this function for all transmitted frames after they have been
@@ -1730,19 +1771,45 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
                                 struct sk_buff *skb);
 /**
- * ieee80211_beacon_get - beacon generation function
+ * ieee80211_beacon_get_tim - beacon generation function
 * @hw: pointer obtained from ieee80211_alloc_hw().
 * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
+ * @tim_offset: pointer to variable that will receive the TIM IE offset.
+ *      Set to 0 if invalid (in non-AP modes).
+ * @tim_length: pointer to variable that will receive the TIM IE length,
+ *      (including the ID and length bytes!).
+ *      Set to 0 if invalid (in non-AP modes).
+ *
+ * If the driver implements beaconing modes, it must use this function to
+ * obtain the beacon frame/template.
 *
 * If the beacon frames are generated by the host system (i.e., not in
- * hardware/firmware), the low-level driver uses this function to receive
+ * hardware/firmware), the driver uses this function to get each beacon
- * the next beacon frame from the 802.11 code. The low-level is responsible
+ * frame from mac80211 -- it is responsible for calling this function
- * for calling this function before beacon data is needed (e.g., based on
+ * before the beacon is needed (e.g. based on hardware interrupt).
- * hardware interrupt). Returned skb is used only once and low-level driver
+ *
- * is responsible for freeing it.
+ * If the beacon frames are generated by the device, then the driver
+ * must use the returned beacon as the template and change the TIM IE
+ * according to the current DTIM parameters/TIM bitmap.
+ *
+ * The driver is responsible for freeing the returned skb.
 */
-struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
+struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif);
+                                         struct ieee80211_vif *vif,
+                                         u16 *tim_offset, u16 *tim_length);
+/**
+ * ieee80211_beacon_get - beacon generation function
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
+ *
+ * See ieee80211_beacon_get_tim().
+ */
+static inline struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
+                                                   struct ieee80211_vif *vif)
+{
+        return ieee80211_beacon_get_tim(hw, vif, NULL, NULL);
+}
 /**
 * ieee80211_rts_get - RTS frame generation function
@@ -1987,8 +2054,7 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
 /**
 * ieee80211_start_tx_ba_session - Start a tx Block Ack session.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @sta: the station for which to start a BA session
- * @ra: receiver address of the BA session recipient
 * @tid: the TID to BA on.
 *
 * Return: success if addBA request was sent, failure otherwise
@@ -1997,22 +2063,22 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
 * the need to start aggregation on a certain RA/TID, the session level
 * will be managed by the mac80211.
 */
-int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid);
+int ieee80211_start_tx_ba_session(struct ieee80211_sta *sta, u16 tid);
 /**
 * ieee80211_start_tx_ba_cb - low level driver ready to aggregate.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
 * @ra: receiver address of the BA session recipient.
 * @tid: the TID to BA on.
 *
 * This function must be called by low level driver once it has
 * finished with preparations for the BA session.
 */
-void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid);
+void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
 /**
 * ieee80211_start_tx_ba_cb_irqsafe - low level driver ready to aggregate.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
 * @ra: receiver address of the BA session recipient.
 * @tid: the TID to BA on.
 *
@@ -2020,13 +2086,12 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid);
 * finished with preparations for the BA session.
 * This version of the function is IRQ-safe.
 */
-void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
+void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                      u16 tid);
 /**
 * ieee80211_stop_tx_ba_session - Stop a Block Ack session.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @sta: the station whose BA session to stop
- * @ra: receiver address of the BA session recipient
 * @tid: the TID to stop BA.
 * @initiator: if indicates initiator DELBA frame will be sent.
 *
@@ -2036,24 +2101,23 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
 * the need to stop aggregation on a certain RA/TID, the session level
 * will be managed by the mac80211.
 */
-int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw,
+int ieee80211_stop_tx_ba_session(struct ieee80211_sta *sta, u16 tid,
-                                 u8 *ra, u16 tid,
                                 enum ieee80211_back_parties initiator);
 /**
 * ieee80211_stop_tx_ba_cb - low level driver ready to stop aggregate.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
 * @ra: receiver address of the BA session recipient.
 * @tid: the desired TID to BA on.
 *
 * This function must be called by low level driver once it has
 * finished with preparations for the BA session tear down.
 */
-void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid);
+void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
 /**
 * ieee80211_stop_tx_ba_cb_irqsafe - low level driver ready to stop aggregate.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
 * @ra: receiver address of the BA session recipient.
 * @tid: the desired TID to BA on.
 *
@@ -2061,22 +2125,75 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid);
 * finished with preparations for the BA session tear down.
 * This version of the function is IRQ-safe.
 */
-void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
+void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                     u16 tid);
 /**
 * ieee80211_find_sta - find a station
 *
- * @hw: pointer as obtained from ieee80211_alloc_hw()
+ * @vif: virtual interface to look for station on
 * @addr: station's address
 *
 * This function must be called under RCU lock and the
 * resulting pointer is only valid under RCU lock as well.
 */
-struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_hw *hw,
+struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_vif *vif,
                                         const u8 *addr);
 /**
+ * ieee80211_find_sta_by_hw - find a station on hardware
+ *
+ * @hw: pointer as obtained from ieee80211_alloc_hw()
+ * @addr: station's address
+ *
+ * This function must be called under RCU lock and the
+ * resulting pointer is only valid under RCU lock as well.
+ *
+ * NOTE: This function should not be used! When mac80211 is converted
+ *       internally to properly keep track of stations on multiple
+ *       virtual interfaces, it will not always know which station to
+ *       return here since a single address might be used by multiple
+ *       logical stations (e.g. consider a station connecting to another
+ *       BSSID on the same AP hardware without disconnecting first).
+ *
+ * DO NOT USE THIS FUNCTION.
+ */
+struct ieee80211_sta *ieee80211_find_sta_by_hw(struct ieee80211_hw *hw,
+                                               const u8 *addr);
+/**
+ * ieee80211_sta_block_awake - block station from waking up
+ * @hw: the hardware
+ * @pubsta: the station
+ * @block: whether to block or unblock
+ *
+ * Some devices require that all frames that are on the queues
+ * for a specific station that went to sleep are flushed before
+ * a poll response or frames after the station woke up can be
+ * delivered to that it. Note that such frames must be rejected
+ * by the driver as filtered, with the appropriate status flag.
+ *
+ * This function allows implementing this mode in a race-free
+ * manner.
+ *
+ * To do this, a driver must keep track of the number of frames
+ * still enqueued for a specific station. If this number is not
+ * zero when the station goes to sleep, the driver must call
+ * this function to force mac80211 to consider the station to
+ * be asleep regardless of the station's actual state. Once the
+ * number of outstanding frames reaches zero, the driver must
+ * call this function again to unblock the station. That will
+ * cause mac80211 to be able to send ps-poll responses, and if
+ * the station queried in the meantime then frames will also
+ * be sent out as a result of this. Additionally, the driver
+ * will be notified that the station woke up some time after
+ * it is unblocked, regardless of whether the station actually
+ * woke up while blocked or not.
+ */
+void ieee80211_sta_block_awake(struct ieee80211_hw *hw,
+                               struct ieee80211_sta *pubsta, bool block);
+/**
 * ieee80211_beacon_loss - inform hardware does not receive beacons
 *
 * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 3817fda82a80..0302f31a2fb7 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -37,8 +37,7 @@
 struct neighbour;
-struct neigh_parms
+struct neigh_parms {
-{
 #ifdef CONFIG_NET_NS
        struct net *net;
 #endif
@@ -70,8 +69,7 @@ struct neigh_parms
        int     locktime;
 };
-struct neigh_statistics
+struct neigh_statistics {
-{
        unsigned long allocs;           /* number of allocated neighs */
        unsigned long destroys;         /* number of destroyed neighs */
        unsigned long hash_grows;       /* number of hash resizes */
@@ -97,8 +95,7 @@ struct neigh_statistics
                preempt_enable();                                       \
        } while (0)
-struct neighbour
+struct neighbour {
-{
        struct neighbour        *next;
        struct neigh_table      *tbl;
        struct neigh_parms      *parms;
@@ -122,8 +119,7 @@ struct neighbour
        u8                      primary_key[0];
 };
-struct neigh_ops
+struct neigh_ops {
-{
        int                     family;
        void                    (*solicit)(struct neighbour *, struct sk_buff*);
        void                    (*error_report)(struct neighbour *, struct sk_buff*);
@@ -133,8 +129,7 @@ struct neigh_ops
        int                     (*queue_xmit)(struct sk_buff*);
 };
-struct pneigh_entry
+struct pneigh_entry {
-{
        struct pneigh_entry     *next;
 #ifdef CONFIG_NET_NS
        struct net              *net;
@@ -149,8 +144,7 @@ struct pneigh_entry
 */
-struct neigh_table
+struct neigh_table {
-{
        struct neigh_table      *next;
        int                     family;
        int                     entry_size;
@@ -264,8 +258,7 @@ extern int			neigh_sysctl_register(struct net_device *dev,
                                                      struct neigh_parms *p,
                                                      int p_id, int pdev_id,
                                                      char *p_name,
-                                                      proc_handler *proc_handler,
+                                                      proc_handler *proc_handler);
-                                                      ctl_handler *strategy);
 extern void                     neigh_sysctl_unregister(struct neigh_parms *p);
 static inline void __neigh_parms_put(struct neigh_parms *parms)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index a1202841aadd..f307e133d14c 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -28,6 +28,10 @@ struct ctl_table_header;
 struct net_generic;
 struct sock;
+#define NETDEV_HASHBITS    8
+#define NETDEV_HASHENTRIES (1 << NETDEV_HASHBITS)
 struct net {
        atomic_t                count;          /* To decided when the network
                                                 *  namespace should be freed.
@@ -38,7 +42,8 @@ struct net {
                                                 */
 #endif
        struct list_head        list;           /* list of network namespaces */
-        struct work_struct      work;           /* work struct for freeing */
+        struct list_head        cleanup_list;   /* namespaces on death row */
+        struct list_head        exit_list;      /* Use only net_mutex */
        struct proc_dir_entry   *proc_net;
        struct proc_dir_entry   *proc_net_stat;
@@ -80,7 +85,7 @@ struct net {
 #ifdef CONFIG_XFRM
        struct netns_xfrm       xfrm;
 #endif
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_WEXT_CORE
        struct sk_buff_head     wext_nlevents;
 #endif
        struct net_generic      *gen;
@@ -232,6 +237,9 @@ struct pernet_operations {
        struct list_head list;
        int (*init)(struct net *net);
        void (*exit)(struct net *net);
+        void (*exit_batch)(struct list_head *net_exit_list);
+        int *id;
+        size_t size;
 };
 /*
@@ -255,12 +263,8 @@ struct pernet_operations {
 */
 extern int register_pernet_subsys(struct pernet_operations *);
 extern void unregister_pernet_subsys(struct pernet_operations *);
-extern int register_pernet_gen_subsys(int *id, struct pernet_operations *);
-extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *);
 extern int register_pernet_device(struct pernet_operations *);
 extern void unregister_pernet_device(struct pernet_operations *);
-extern int register_pernet_gen_device(int *id, struct pernet_operations *);
-extern void unregister_pernet_gen_device(int id, struct pernet_operations *);
 struct ctl_path;
 struct ctl_table;
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 4f20d58e2ab7..475facc3051a 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -13,8 +13,7 @@
 #include <net/netfilter/nf_conntrack_extend.h>
 /* Connection tracking event types */
-enum ip_conntrack_events
+enum ip_conntrack_events {
-{
        IPCT_NEW                = 0,    /* new conntrack */
        IPCT_RELATED            = 1,    /* related conntrack */
        IPCT_DESTROY            = 2,    /* destroyed conntrack */
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index a9652806d0df..9a2b9cb52271 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -9,8 +9,7 @@
 extern unsigned int nf_ct_expect_hsize;
 extern unsigned int nf_ct_expect_max;
-struct nf_conntrack_expect
+struct nf_conntrack_expect {
-{
        /* Conntrack expectation list member */
        struct hlist_node lnode;
@@ -64,8 +63,7 @@ static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp)
 #endif
 }
-struct nf_conntrack_expect_policy
+struct nf_conntrack_expect_policy {
-{
        unsigned int    max_expected;
        unsigned int    timeout;
 };
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 7f8fc5d123c5..e192dc17c583 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -3,8 +3,7 @@
 #include <net/netfilter/nf_conntrack.h>
-enum nf_ct_ext_id
+enum nf_ct_ext_id {
-{
        NF_CT_EXT_HELPER,
        NF_CT_EXT_NAT,
        NF_CT_EXT_ACCT,
@@ -65,8 +64,7 @@ __nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);
 #define NF_CT_EXT_F_PREALLOC    0x0001
-struct nf_ct_ext_type
+struct nf_ct_ext_type {
-{
        /* Destroys relationships (can be NULL). */
        void (*destroy)(struct nf_conn *ct);
        /* Called when realloacted (can be NULL).
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 1b7068000927..d015de92e03f 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -16,8 +16,7 @@ struct module;
 #define NF_CT_HELPER_NAME_LEN   16
-struct nf_conntrack_helper
+struct nf_conntrack_helper {
-{
        struct hlist_node hnode;        /* Internal use. */
        const char *name;               /* name of the module */
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 9f99d36d5de9..a7547611e8f1 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -16,8 +16,7 @@
 #include <linux/seq_file.h>
 #include <net/netfilter/nf_conntrack.h>
-struct nf_conntrack_l3proto
+struct nf_conntrack_l3proto {
-{
        /* L3 Protocol Family number. ex) PF_INET */
        u_int16_t l3proto;
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 3767fb41e541..ca6dcf3445ab 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -15,8 +15,7 @@
 struct seq_file;
-struct nf_conntrack_l4proto
+struct nf_conntrack_l4proto {
-{
        /* L3 Protocol number. */
        u_int16_t l3proto;
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index 2628c154d40e..4ee44c84a304 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -26,8 +26,7 @@
 /* The protocol-specific manipulable parts of the tuple: always in
   network order! */
-union nf_conntrack_man_proto
+union nf_conntrack_man_proto {
-{
        /* Add other protocols here. */
        __be16 all;
@@ -52,8 +51,7 @@ union nf_conntrack_man_proto
 };
 /* The manipulable part of the tuple. */
-struct nf_conntrack_man
+struct nf_conntrack_man {
-{
        union nf_inet_addr u3;
        union nf_conntrack_man_proto u;
        /* Layer 3 protocol */
@@ -61,8 +59,7 @@ struct nf_conntrack_man
 };
 /* This contains the information to distinguish a connection. */
-struct nf_conntrack_tuple
+struct nf_conntrack_tuple {
-{
        struct nf_conntrack_man src;
        /* These are the parts of the tuple which are fixed. */
@@ -100,8 +97,7 @@ struct nf_conntrack_tuple
        } dst;
 };
-struct nf_conntrack_tuple_mask
+struct nf_conntrack_tuple_mask {
-{
        struct {
                union nf_inet_addr u3;
                union nf_conntrack_man_proto u;
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index 8df0b7f7fc6e..f5f09f032a90 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -5,8 +5,7 @@
 #define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16
-enum nf_nat_manip_type
+enum nf_nat_manip_type {
-{
        IP_NAT_MANIP_SRC,
        IP_NAT_MANIP_DST
 };
@@ -30,8 +29,7 @@ struct nf_nat_seq {
 };
 /* Single range specification. */
-struct nf_nat_range
+struct nf_nat_range {
-{
        /* Set to OR of flags above. */
        unsigned int flags;
@@ -43,8 +41,7 @@ struct nf_nat_range
 };
 /* For backwards compat: don't use in modern code. */
-struct nf_nat_multi_range_compat
+struct nf_nat_multi_range_compat {
-{
        unsigned int rangesize; /* Must be 1. */
        /* hangs off end. */
@@ -57,8 +54,7 @@ struct nf_nat_multi_range_compat
 #include <net/netfilter/nf_conntrack_extend.h>
 /* per conntrack: nat application helper private data */
-union nf_conntrack_nat_help
+union nf_conntrack_nat_help {
-{
        /* insert nat helper private data here */
        struct nf_nat_pptp nat_pptp_info;
 };
@@ -66,8 +62,7 @@ union nf_conntrack_nat_help
 struct nf_conn;
 /* The structure embedded in the conntrack structure. */
-struct nf_conn_nat
+struct nf_conn_nat {
-{
        struct hlist_node bysource;
        struct nf_nat_seq seq[IP_CT_DIR_MAX];
        struct nf_conn *ct;
diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h
index f3662c4394ef..c398017ccfa3 100644
--- a/include/net/netfilter/nf_nat_protocol.h
+++ b/include/net/netfilter/nf_nat_protocol.h
@@ -6,8 +6,7 @@
 struct nf_nat_range;
-struct nf_nat_protocol
+struct nf_nat_protocol {
-{
        /* Protocol number. */
        unsigned int protonum;
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 0c04fd2a700b..ff4982ab84b6 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -12,9 +12,11 @@
 * stuff on the struct net without explicit struct net modification
 *
 * The rules are simple:
- * 1. register the ops with register_pernet_gen_device to get the id
+ * 1. set pernet_operations->id.  After register_pernet_device you
- *    of your private pointer;
+ *    will have the id of your private pointer.
- * 2. call net_assign_generic() to put the private data on the struct
+ * 2. Either set pernet_operations->size (to have the code allocate and
+ *    free a private structure pointed to from struct net ) or 
+ *    call net_assign_generic() to put the private data on the struct
 *    net (most preferably this should be done in the ->init callback
 *    of the ops registered);
 * 3. do not change this pointer while the net is alive;
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 1ba912749caa..56f8e5585df7 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -43,6 +43,7 @@ struct netns_xfrm {
        struct work_struct      policy_hash_work;
        struct sock             *nlsk;
+        struct sock             *nlsk_stash;
        u32                     sysctl_aevent_etime;
        u32                     sysctl_aevent_rseqth;
diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h
index d43f71b5ec00..7b114079a51b 100644
--- a/include/net/phonet/phonet.h
+++ b/include/net/phonet/phonet.h
@@ -46,7 +46,9 @@ static inline struct pn_sock *pn_sk(struct sock *sk)
 extern const struct proto_ops phonet_dgram_ops;
+void pn_sock_init(void);
 struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *sa);
+void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb);
 void phonet_get_local_port_range(int *min, int *max);
 void pn_sock_hash(struct sock *sk);
 void pn_sock_unhash(struct sock *sk);
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h
index 44c923c9e21d..d7b989ca3d63 100644
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -25,7 +25,7 @@
 struct phonet_device_list {
        struct list_head list;
-        spinlock_t lock;
+        struct mutex lock;
 };
 struct phonet_device_list *phonet_device_list(struct net *net);
@@ -47,6 +47,12 @@ u8 phonet_address_get(struct net_device *dev, u8 addr);
 int phonet_address_lookup(struct net *net, u8 addr);
 void phonet_address_notify(int event, struct net_device *dev, u8 addr);
+int phonet_route_add(struct net_device *dev, u8 daddr);
+int phonet_route_del(struct net_device *dev, u8 daddr);
+void rtm_phonet_notify(int event, struct net_device *dev, u8 dst);
+struct net_device *phonet_route_get(struct net *net, u8 daddr);
+struct net_device *phonet_route_output(struct net *net, u8 daddr);
 #define PN_NO_ADDR      0xff
 extern const struct file_operations pn_sock_seq_fops;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index d1ca31444644..dd3031aed9d5 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -7,8 +7,7 @@
 /* Basic packet classifier frontend definitions. */
-struct tcf_walker
+struct tcf_walker {
-{
        int     stop;
        int     skip;
        int     count;
@@ -61,8 +60,7 @@ tcf_unbind_filter(struct tcf_proto *tp, struct tcf_result *r)
                tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
 }
-struct tcf_exts
+struct tcf_exts {
-{
 #ifdef CONFIG_NET_CLS_ACT
        struct tc_action *action;
 #endif
@@ -71,8 +69,7 @@ struct tcf_exts
 /* Map to export classifier specific extension TLV types to the
 * generic extensions API. Unsupported extensions must be set to 0.
 */
-struct tcf_ext_map
+struct tcf_ext_map {
-{
        int action;
        int police;
 };
@@ -143,8 +140,7 @@ extern int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
 /**
 * struct tcf_pkt_info - packet information
 */
-struct tcf_pkt_info
+struct tcf_pkt_info {
-{
        unsigned char *         ptr;
        int                     nexthdr;
 };
@@ -162,8 +158,7 @@ struct tcf_ematch_ops;
 * @datalen: length of the ematch specific configuration data
 * @data: ematch specific data
 */
-struct tcf_ematch
+struct tcf_ematch {
-{
        struct tcf_ematch_ops * ops;
        unsigned long           data;
        unsigned int            datalen;
@@ -211,8 +206,7 @@ static inline int tcf_em_early_end(struct tcf_ematch *em, int result)
 * @hdr: ematch tree header supplied by userspace
 * @matches: array of ematches
 */
-struct tcf_ematch_tree
+struct tcf_ematch_tree {
-{
        struct tcf_ematch_tree_hdr hdr;
        struct tcf_ematch *     matches;
        
@@ -230,8 +224,7 @@ struct tcf_ematch_tree
 * @owner: owner, must be set to THIS_MODULE
 * @link: link to previous/next ematch module (internal use)
 */
-struct tcf_ematch_ops
+struct tcf_ematch_ops {
-{
        int                     kind;
        int                     datalen;
        int                     (*change)(struct tcf_proto *, void *,
@@ -302,8 +295,7 @@ static inline int tcf_em_tree_match(struct sk_buff *skb,
 #else /* CONFIG_NET_EMATCH */
-struct tcf_ematch_tree
+struct tcf_ematch_tree {
-{
 };
 #define tcf_em_tree_validate(tp, tb, t) ((void)(t), 0)
@@ -351,9 +343,9 @@ tcf_match_indev(struct sk_buff *skb, char *indev)
        struct net_device *dev;
        if (indev[0]) {
-                if  (!skb->iif)
+                if  (!skb->skb_iif)
                        return 0;
-                dev = __dev_get_by_index(dev_net(skb->dev), skb->iif);
+                dev = __dev_get_by_index(dev_net(skb->dev), skb->skb_iif);
                if (!dev || strcmp(indev, dev->name))
                        return 0;
        }
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index f911ec7598ef..2d567265363e 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -5,8 +5,7 @@
 #include <linux/ktime.h>
 #include <net/sch_generic.h>
-struct qdisc_walker
+struct qdisc_walker {
-{
        int     stop;
        int     skip;
        int     count;
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 60249e51b669..f1effdd3c265 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -47,8 +47,7 @@ struct net_protocol {
 };
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-struct inet6_protocol 
+struct inet6_protocol {
-{
        int     (*handler)(struct sk_buff *skb);
        void    (*err_handler)(struct sk_buff *skb,
@@ -83,10 +82,6 @@ struct inet_protosw {
        struct proto     *prot;
        const struct proto_ops *ops;
  
-        int              capability; /* Which (if any) capability do
-                                      * we need to use this socket
-                                      * interface?
-                                      */
        char             no_check;   /* checksum on rcv/xmit/none? */
        unsigned char    flags;      /* See INET_PROTOSW_* below.  */
 };
diff --git a/include/net/red.h b/include/net/red.h
index 3cf31d466a81..995108e54d9f 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -90,8 +90,7 @@
 #define RED_STAB_SIZE   256
 #define RED_STAB_MASK   (RED_STAB_SIZE - 1)
-struct red_stats
+struct red_stats {
-{
        u32             prob_drop;      /* Early probability drops */
        u32             prob_mark;      /* Early probability marks */
        u32             forced_drop;    /* Forced drops, qavg > max_thresh */
@@ -101,8 +100,7 @@ struct red_stats
        u32             backlog;
 };
-struct red_parms
+struct red_parms {
-{
        /* Parameters */
        u32             qth_min;        /* Min avg length threshold: A scaled */
        u32             qth_max;        /* Max avg length threshold: A scaled */
diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index c7190846e128..c9b50ebd9ce9 100644
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -27,13 +27,19 @@ struct sk_buff;
 struct dst_entry;
 struct proto;
+/* empty to "strongly type" an otherwise void parameter.
+ */
+struct request_values {
+};
 struct request_sock_ops {
        int             family;
        int             obj_size;
        struct kmem_cache       *slab;
        char            *slab_name;
        int             (*rtx_syn_ack)(struct sock *sk,
-                                       struct request_sock *req);
+                                       struct request_sock *req,
+                                       struct request_values *rvp);
        void            (*send_ack)(struct sock *sk, struct sk_buff *skb,
                                    struct request_sock *req);
        void            (*send_reset)(struct sock *sk,
diff --git a/include/net/route.h b/include/net/route.h
index 40f6346ef496..bce6dd68d27b 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -49,10 +49,8 @@
 struct fib_nh;
 struct inet_peer;
-struct rtable
+struct rtable {
-{
+        union {
-        union
-        {
                struct dst_entry        dst;
        } u;
@@ -77,16 +75,14 @@ struct rtable
        struct inet_peer        *peer; /* long-living peer info */
 };
-struct ip_rt_acct
+struct ip_rt_acct {
-{
        __u32   o_bytes;
        __u32   o_packets;
        __u32   i_bytes;
        __u32   i_packets;
 };
-struct rt_cache_stat 
+struct rt_cache_stat {
-{
        unsigned int in_hit;
        unsigned int in_slow_tot;
        unsigned int in_slow_mc;
@@ -112,6 +108,7 @@ extern int		ip_rt_init(void);
 extern void             ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,
                                       __be32 src, struct net_device *dev);
 extern void             rt_cache_flush(struct net *net, int how);
+extern void             rt_cache_flush_batch(void);
 extern int              __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);
 extern int              ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);
 extern int              ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, int flags);
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index c3aa044d3fc3..48d3efcb0880 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -55,13 +55,15 @@ struct rtnl_link_ops {
        int                     (*validate)(struct nlattr *tb[],
                                            struct nlattr *data[]);
-        int                     (*newlink)(struct net_device *dev,
+        int                     (*newlink)(struct net *src_net,
+                                           struct net_device *dev,
                                           struct nlattr *tb[],
                                           struct nlattr *data[]);
        int                     (*changelink)(struct net_device *dev,
                                              struct nlattr *tb[],
                                              struct nlattr *data[]);
-        void                    (*dellink)(struct net_device *dev);
+        void                    (*dellink)(struct net_device *dev,
+                                           struct list_head *head);
        size_t                  (*get_size)(const struct net_device *dev);
        int                     (*fill_info)(struct sk_buff *skb,
@@ -82,8 +84,9 @@ extern void	rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops);
 extern int      rtnl_link_register(struct rtnl_link_ops *ops);
 extern void     rtnl_link_unregister(struct rtnl_link_ops *ops);
-extern struct net_device *rtnl_create_link(struct net *net, char *ifname,
+extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);
-                const struct rtnl_link_ops *ops, struct nlattr *tb[]);
+extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
+        char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]);
 extern const struct nla_policy ifla_policy[IFLA_MAX+1];
 #define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index c33180dd42b4..dad558bc06fa 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -15,16 +15,14 @@ struct qdisc_walker;
 struct tcf_walker;
 struct module;
-struct qdisc_rate_table
+struct qdisc_rate_table {
-{
        struct tc_ratespec rate;
        u32             data[256];
        struct qdisc_rate_table *next;
        int             refcnt;
 };
-enum qdisc_state_t
+enum qdisc_state_t {
-{
        __QDISC_STATE_RUNNING,
        __QDISC_STATE_SCHED,
        __QDISC_STATE_DEACTIVATED,
@@ -37,8 +35,7 @@ struct qdisc_size_table {
        u16                     data[];
 };
-struct Qdisc
+struct Qdisc {
-{
        int                     (*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
        struct sk_buff *        (*dequeue)(struct Qdisc *dev);
        unsigned                flags;
@@ -78,8 +75,7 @@ struct Qdisc
        struct gnet_stats_queue qstats;
 };
-struct Qdisc_class_ops
+struct Qdisc_class_ops {
-{
        /* Child qdisc manipulation */
        struct netdev_queue *   (*select_queue)(struct Qdisc *, struct tcmsg *);
        int                     (*graft)(struct Qdisc *, unsigned long cl,
@@ -108,8 +104,7 @@ struct Qdisc_class_ops
                                        struct gnet_dump *);
 };
-struct Qdisc_ops
+struct Qdisc_ops {
-{
        struct Qdisc_ops        *next;
        const struct Qdisc_class_ops    *cl_ops;
        char                    id[IFNAMSIZ];
@@ -133,14 +128,12 @@ struct Qdisc_ops
 };
-struct tcf_result
+struct tcf_result {
-{
        unsigned long   class;
        u32             classid;
 };
-struct tcf_proto_ops
+struct tcf_proto_ops {
-{
        struct tcf_proto_ops    *next;
        char                    kind[IFNAMSIZ];
@@ -164,8 +157,7 @@ struct tcf_proto_ops
        struct module           *owner;
 };
-struct tcf_proto
+struct tcf_proto {
-{
        /* Fast access part */
        struct tcf_proto        *next;
        void                    *root;
@@ -261,14 +253,12 @@ extern struct Qdisc_ops noop_qdisc_ops;
 extern struct Qdisc_ops pfifo_fast_ops;
 extern struct Qdisc_ops mq_qdisc_ops;
-struct Qdisc_class_common
+struct Qdisc_class_common {
-{
        u32                     classid;
        struct hlist_node       hnode;
 };
-struct Qdisc_class_hash
+struct Qdisc_class_hash {
-{
        struct hlist_head       *hash;
        unsigned int            hashsize;
        unsigned int            hashmask;
diff --git a/include/net/scm.h b/include/net/scm.h
index cf48c800e926..8360e47aa7e3 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -12,15 +12,13 @@
 */
 #define SCM_MAX_FD      255
-struct scm_fp_list
+struct scm_fp_list {
-{
        struct list_head        list;
        int                     count;
        struct file             *fp[SCM_MAX_FD];
 };
-struct scm_cookie
+struct scm_cookie {
-{
        struct ucred            creds;          /* Skb credentials      */
        struct scm_fp_list      *fp;            /* Passed files         */
 #ifdef CONFIG_SECURITY_NETWORK
@@ -88,8 +86,7 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc
 static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
                                struct scm_cookie *scm, int flags)
 {
-        if (!msg->msg_control)
+        if (!msg->msg_control) {
-        {
                if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp)
                        msg->msg_flags |= MSG_CTRUNC;
                scm_destroy(scm);
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index 58f714a3b670..63908840eef0 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -308,6 +308,10 @@ enum { SCTP_MAX_GABS = 16 };
 #define SCTP_DEFAULT_MINWINDOW  1500    /* default minimum rwnd size */
 #define SCTP_DEFAULT_MAXWINDOW  65535   /* default rwnd size */
+#define SCTP_DEFAULT_RWND_SHIFT  4      /* by default, update on 1/16 of
+                                         * rcvbuf, which is 1/8 of initial
+                                         * window
+                                         */
 #define SCTP_DEFAULT_MAXSEGMENT 1500    /* MTU size, this is the limit
                                         * to which we will raise the P-MTU.
                                         */
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 8a6d5297de16..78740ec57d5d 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -227,8 +227,7 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics);
 #endif /* !TEST_FRAME */
 /* sctp mib definitions */
-enum
+enum {
-{
        SCTP_MIB_NUM = 0,
        SCTP_MIB_CURRESTAB,                     /* CurrEstab */
        SCTP_MIB_ACTIVEESTABS,                  /* ActiveEstabs */
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index c1dd89365833..851c813adb3a 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -243,7 +243,8 @@ struct sctp_chunk *sctp_make_op_error(const struct sctp_association *,
                                 const struct sctp_chunk *chunk,
                                 __be16 cause_code,
                                 const void *payload,
-                                 size_t paylen);
+                                 size_t paylen,
+                                 size_t reserve_tail);
 struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *,
                                              union sctp_addr *,
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 0a474568b003..7571e32723bf 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -231,6 +231,11 @@ extern struct sctp_globals {
        /* Flag to indicate whether computing and verifying checksum
         * is disabled. */
        int checksum_disable;
+        /* Threshold for rwnd update SACKS.  Receive buffer shifted this many
+         * bits is an indicator of when to send and window update SACK.
+         */
+        int rwnd_update_shift;
 } sctp_globals;
 #define sctp_rto_initial                (sctp_globals.rto_initial)
@@ -267,6 +272,7 @@ extern struct sctp_globals {
 #define sctp_prsctp_enable              (sctp_globals.prsctp_enable)
 #define sctp_auth_enable                (sctp_globals.auth_enable)
 #define sctp_checksum_disable           (sctp_globals.checksum_disable)
+#define sctp_rwnd_upd_shift             (sctp_globals.rwnd_update_shift)
 /* SCTP Socket type: UDP or TCP style. */
 typedef enum {
@@ -935,6 +941,8 @@ struct sctp_transport {
        /* Data that has been sent, but not acknowledged. */
        __u32 flight_size;
+        __u32 burst_limited;    /* Holds old cwnd when max.burst is applied */
        /* TSN marking the fast recovery exit point */
        __u32 fast_recovery_exit;
@@ -943,12 +951,6 @@ struct sctp_transport {
        /* Source address. */
        union sctp_addr saddr;
-        /* When was the last time(in jiffies) that a data packet was sent on
-         * this transport?  This is used to adjust the cwnd when the transport
-         * becomes inactive.
-         */
-        unsigned long last_time_used;
        /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
         * the destination address every heartbeat interval.
         */
@@ -1069,6 +1071,8 @@ void sctp_transport_put(struct sctp_transport *);
 void sctp_transport_update_rto(struct sctp_transport *, __u32);
 void sctp_transport_raise_cwnd(struct sctp_transport *, __u32, __u32);
 void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t);
+void sctp_transport_burst_limited(struct sctp_transport *);
+void sctp_transport_burst_reset(struct sctp_transport *);
 unsigned long sctp_transport_timeout(struct sctp_transport *);
 void sctp_transport_reset(struct sctp_transport *);
 void sctp_transport_update_pmtu(struct sctp_transport *, u32);
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index be2334aaf52e..2b2769c5ca9f 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -60,96 +60,49 @@ typedef __s32 sctp_assoc_t;
 /* The following symbols come from the Sockets API Extensions for
 * SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.
 */
-enum sctp_optname {
+#define SCTP_RTOINFO    0
-        SCTP_RTOINFO,
+#define SCTP_ASSOCINFO  1
-#define SCTP_RTOINFO SCTP_RTOINFO
+#define SCTP_INITMSG    2
-        SCTP_ASSOCINFO,
+#define SCTP_NODELAY    3               /* Get/set nodelay option. */
-#define SCTP_ASSOCINFO SCTP_ASSOCINFO
+#define SCTP_AUTOCLOSE  4
-        SCTP_INITMSG,
+#define SCTP_SET_PEER_PRIMARY_ADDR 5
-#define SCTP_INITMSG SCTP_INITMSG
+#define SCTP_PRIMARY_ADDR       6
-        SCTP_NODELAY,   /* Get/set nodelay option. */
+#define SCTP_ADAPTATION_LAYER   7
-#define SCTP_NODELAY    SCTP_NODELAY
+#define SCTP_DISABLE_FRAGMENTS  8
-        SCTP_AUTOCLOSE,
+#define SCTP_PEER_ADDR_PARAMS   9
-#define SCTP_AUTOCLOSE SCTP_AUTOCLOSE
+#define SCTP_DEFAULT_SEND_PARAM 10
-        SCTP_SET_PEER_PRIMARY_ADDR, 
+#define SCTP_EVENTS     11
-#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR
+#define SCTP_I_WANT_MAPPED_V4_ADDR 12   /* Turn on/off mapped v4 addresses  */
-        SCTP_PRIMARY_ADDR,
+#define SCTP_MAXSEG     13              /* Get/set maximum fragment. */
-#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR
+#define SCTP_STATUS     14
-        SCTP_ADAPTATION_LAYER,
+#define SCTP_GET_PEER_ADDR_INFO 15
-#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER
+#define SCTP_DELAYED_ACK_TIME   16
-        SCTP_DISABLE_FRAGMENTS,
+#define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME
-#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS
+#define SCTP_CONTEXT    17
-        SCTP_PEER_ADDR_PARAMS,
+#define SCTP_FRAGMENT_INTERLEAVE        18
-#define SCTP_PEER_ADDR_PARAMS SCTP_PEER_ADDR_PARAMS
+#define SCTP_PARTIAL_DELIVERY_POINT     19 /* Set/Get partial delivery point */
-        SCTP_DEFAULT_SEND_PARAM,
+#define SCTP_MAX_BURST  20              /* Set/Get max burst */
-#define SCTP_DEFAULT_SEND_PARAM SCTP_DEFAULT_SEND_PARAM
+#define SCTP_AUTH_CHUNK 21      /* Set only: add a chunk type to authenticate */
-        SCTP_EVENTS,
+#define SCTP_HMAC_IDENT 22
-#define SCTP_EVENTS SCTP_EVENTS
+#define SCTP_AUTH_KEY   23
-        SCTP_I_WANT_MAPPED_V4_ADDR,  /* Turn on/off mapped v4 addresses  */
+#define SCTP_AUTH_ACTIVE_KEY    24
-#define SCTP_I_WANT_MAPPED_V4_ADDR SCTP_I_WANT_MAPPED_V4_ADDR
+#define SCTP_AUTH_DELETE_KEY    25
-        SCTP_MAXSEG,    /* Get/set maximum fragment. */
+#define SCTP_PEER_AUTH_CHUNKS   26      /* Read only */
-#define SCTP_MAXSEG     SCTP_MAXSEG
+#define SCTP_LOCAL_AUTH_CHUNKS  27      /* Read only */
-        SCTP_STATUS,
+#define SCTP_GET_ASSOC_NUMBER   28      /* Read only */
-#define SCTP_STATUS SCTP_STATUS
-        SCTP_GET_PEER_ADDR_INFO,
+/* Internal Socket Options. Some of the sctp library functions are
-#define SCTP_GET_PEER_ADDR_INFO SCTP_GET_PEER_ADDR_INFO
+ * implemented using these socket options.
-        SCTP_DELAYED_ACK,
+ */
-#define SCTP_DELAYED_ACK_TIME SCTP_DELAYED_ACK
+#define SCTP_SOCKOPT_BINDX_ADD  100     /* BINDX requests for adding addrs */
-#define SCTP_DELAYED_ACK SCTP_DELAYED_ACK
+#define SCTP_SOCKOPT_BINDX_REM  101     /* BINDX requests for removing addrs. */
-        SCTP_CONTEXT,   /* Receive Context */
+#define SCTP_SOCKOPT_PEELOFF    102     /* peel off association. */
-#define SCTP_CONTEXT SCTP_CONTEXT
+/* Options 104-106 are deprecated and removed. Do not use this space */
-        SCTP_FRAGMENT_INTERLEAVE,
+#define SCTP_SOCKOPT_CONNECTX_OLD       107     /* CONNECTX old requests. */
-#define SCTP_FRAGMENT_INTERLEAVE SCTP_FRAGMENT_INTERLEAVE
+#define SCTP_GET_PEER_ADDRS     108             /* Get all peer addresss. */
-        SCTP_PARTIAL_DELIVERY_POINT,    /* Set/Get partial delivery point */
+#define SCTP_GET_LOCAL_ADDRS    109             /* Get all local addresss. */
-#define SCTP_PARTIAL_DELIVERY_POINT SCTP_PARTIAL_DELIVERY_POINT
+#define SCTP_SOCKOPT_CONNECTX   110             /* CONNECTX requests. */
-        SCTP_MAX_BURST,         /* Set/Get max burst */
+#define SCTP_SOCKOPT_CONNECTX3  111     /* CONNECTX requests (updated) */
-#define SCTP_MAX_BURST SCTP_MAX_BURST
-        SCTP_AUTH_CHUNK,        /* Set only: add a chunk type to authenticat */
-#define SCTP_AUTH_CHUNK SCTP_AUTH_CHUNK
-        SCTP_HMAC_IDENT,
-#define SCTP_HMAC_IDENT SCTP_HMAC_IDENT
-        SCTP_AUTH_KEY,
-#define SCTP_AUTH_KEY SCTP_AUTH_KEY
-        SCTP_AUTH_ACTIVE_KEY,
-#define SCTP_AUTH_ACTIVE_KEY SCTP_AUTH_ACTIVE_KEY
-        SCTP_AUTH_DELETE_KEY,
-#define SCTP_AUTH_DELETE_KEY SCTP_AUTH_DELETE_KEY
-        SCTP_PEER_AUTH_CHUNKS,          /* Read only */
-#define SCTP_PEER_AUTH_CHUNKS SCTP_PEER_AUTH_CHUNKS
-        SCTP_LOCAL_AUTH_CHUNKS,         /* Read only */
-#define SCTP_LOCAL_AUTH_CHUNKS SCTP_LOCAL_AUTH_CHUNKS
-        SCTP_GET_ASSOC_NUMBER,          /* Read only */
-#define SCTP_GET_ASSOC_NUMBER SCTP_GET_ASSOC_NUMBER
-        /* Internal Socket Options. Some of the sctp library functions are 
-         * implemented using these socket options.
-         */
-        SCTP_SOCKOPT_BINDX_ADD = 100,/* BINDX requests for adding addresses. */
-#define SCTP_SOCKOPT_BINDX_ADD  SCTP_SOCKOPT_BINDX_ADD
-        SCTP_SOCKOPT_BINDX_REM, /* BINDX requests for removing addresses. */
-#define SCTP_SOCKOPT_BINDX_REM  SCTP_SOCKOPT_BINDX_REM
-        SCTP_SOCKOPT_PEELOFF,   /* peel off association. */
-#define SCTP_SOCKOPT_PEELOFF    SCTP_SOCKOPT_PEELOFF
-        SCTP_GET_PEER_ADDRS_NUM_OLD,    /* Get number of peer addresss. */
-#define SCTP_GET_PEER_ADDRS_NUM_OLD     SCTP_GET_PEER_ADDRS_NUM_OLD
-        SCTP_GET_PEER_ADDRS_OLD,        /* Get all peer addresss. */
-#define SCTP_GET_PEER_ADDRS_OLD SCTP_GET_PEER_ADDRS_OLD
-        SCTP_GET_LOCAL_ADDRS_NUM_OLD,   /* Get number of local addresss. */
-#define SCTP_GET_LOCAL_ADDRS_NUM_OLD    SCTP_GET_LOCAL_ADDRS_NUM_OLD
-        SCTP_GET_LOCAL_ADDRS_OLD,       /* Get all local addresss. */
-#define SCTP_GET_LOCAL_ADDRS_OLD        SCTP_GET_LOCAL_ADDRS_OLD
-        SCTP_SOCKOPT_CONNECTX_OLD, /* CONNECTX old requests. */
-#define SCTP_SOCKOPT_CONNECTX_OLD       SCTP_SOCKOPT_CONNECTX_OLD
-        SCTP_GET_PEER_ADDRS,    /* Get all peer addresss. */
-#define SCTP_GET_PEER_ADDRS     SCTP_GET_PEER_ADDRS
-        SCTP_GET_LOCAL_ADDRS,   /* Get all local addresss. */
-#define SCTP_GET_LOCAL_ADDRS    SCTP_GET_LOCAL_ADDRS
-        SCTP_SOCKOPT_CONNECTX, /* CONNECTX requests. */
-#define SCTP_SOCKOPT_CONNECTX   SCTP_SOCKOPT_CONNECTX
-        SCTP_SOCKOPT_CONNECTX3, /* CONNECTX requests. (new implementation) */
-#define SCTP_SOCKOPT_CONNECTX3  SCTP_SOCKOPT_CONNECTX3
-};
 /*
 * 5.2.1 SCTP Initiation Structure (SCTP_INIT)
@@ -206,6 +159,7 @@ enum sctp_sinfo_flags {
        SCTP_UNORDERED = 1,  /* Send/receive message unordered. */
        SCTP_ADDR_OVER = 2,  /* Override the primary destination. */
        SCTP_ABORT=4,        /* Send an ABORT message to the peer. */
+        SCTP_SACK_IMMEDIATELY = 8,      /* SACK should be sent without delay */
        SCTP_EOF=MSG_FIN,    /* Initiate graceful shutdown process. */  
 };
diff --git a/include/net/sock.h b/include/net/sock.h
index 9f96394f694e..3f1a4804bb3f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -105,14 +105,17 @@ struct net;
 /**
 *      struct sock_common - minimal network layer representation of sockets
 *      @skc_node: main hash linkage for various protocol lookup tables
- *      @skc_nulls_node: main hash linkage for UDP/UDP-Lite protocol
+ *      @skc_nulls_node: main hash linkage for TCP/UDP/UDP-Lite protocol
 *      @skc_refcnt: reference count
+ *      @skc_tx_queue_mapping: tx queue number for this connection
 *      @skc_hash: hash value used with various protocol lookup tables
+ *      @skc_u16hashes: two u16 hash values used by UDP lookup tables
 *      @skc_family: network address family
 *      @skc_state: Connection state
 *      @skc_reuse: %SO_REUSEADDR setting
 *      @skc_bound_dev_if: bound device index if != 0
 *      @skc_bind_node: bind hash linkage for various protocol lookup tables
+ *      @skc_portaddr_node: second hash linkage for UDP/UDP-Lite protocol
 *      @skc_prot: protocol handlers inside a network family
 *      @skc_net: reference to the network namespace of this socket
 *
@@ -128,13 +131,20 @@ struct sock_common {
                struct hlist_nulls_node skc_nulls_node;
        };
        atomic_t                skc_refcnt;
+        int                     skc_tx_queue_mapping;
-        unsigned int            skc_hash;
+        union  {
+                unsigned int    skc_hash;
+                __u16           skc_u16hashes[2];
+        };
        unsigned short          skc_family;
        volatile unsigned char  skc_state;
        unsigned char           skc_reuse;
        int                     skc_bound_dev_if;
-        struct hlist_node       skc_bind_node;
+        union {
+                struct hlist_node       skc_bind_node;
+                struct hlist_nulls_node skc_portaddr_node;
+        };
        struct proto            *skc_prot;
 #ifdef CONFIG_NET_NS
        struct net              *skc_net;
@@ -215,6 +225,7 @@ struct sock {
 #define sk_node                 __sk_common.skc_node
 #define sk_nulls_node           __sk_common.skc_nulls_node
 #define sk_refcnt               __sk_common.skc_refcnt
+#define sk_tx_queue_mapping     __sk_common.skc_tx_queue_mapping
 #define sk_copy_start           __sk_common.skc_hash
 #define sk_hash                 __sk_common.skc_hash
@@ -504,6 +515,8 @@ enum sock_flags {
        SOCK_TIMESTAMPING_SOFTWARE,     /* %SOF_TIMESTAMPING_SOFTWARE */
        SOCK_TIMESTAMPING_RAW_HARDWARE, /* %SOF_TIMESTAMPING_RAW_HARDWARE */
        SOCK_TIMESTAMPING_SYS_HARDWARE, /* %SOF_TIMESTAMPING_SYS_HARDWARE */
+        SOCK_FASYNC, /* fasync() active */
+        SOCK_RXQ_OVFL,
 };
 static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)
@@ -1092,8 +1105,29 @@ static inline void sock_put(struct sock *sk)
 extern int sk_receive_skb(struct sock *sk, struct sk_buff *skb,
                          const int nested);
+static inline void sk_tx_queue_set(struct sock *sk, int tx_queue)
+{
+        sk->sk_tx_queue_mapping = tx_queue;
+}
+static inline void sk_tx_queue_clear(struct sock *sk)
+{
+        sk->sk_tx_queue_mapping = -1;
+}
+static inline int sk_tx_queue_get(const struct sock *sk)
+{
+        return sk->sk_tx_queue_mapping;
+}
+static inline bool sk_tx_queue_recorded(const struct sock *sk)
+{
+        return (sk && sk->sk_tx_queue_mapping >= 0);
+}
 static inline void sk_set_socket(struct sock *sk, struct socket *sock)
 {
+        sk_tx_queue_clear(sk);
        sk->sk_socket = sock;
 }
@@ -1150,6 +1184,7 @@ __sk_dst_set(struct sock *sk, struct dst_entry *dst)
 {
        struct dst_entry *old_dst;
+        sk_tx_queue_clear(sk);
        old_dst = sk->sk_dst_cache;
        sk->sk_dst_cache = dst;
        dst_release(old_dst);
@@ -1168,6 +1203,7 @@ __sk_dst_reset(struct sock *sk)
 {
        struct dst_entry *old_dst;
+        sk_tx_queue_clear(sk);
        old_dst = sk->sk_dst_cache;
        sk->sk_dst_cache = NULL;
        dst_release(old_dst);
@@ -1396,7 +1432,7 @@ static inline unsigned long sock_wspace(struct sock *sk)
 static inline void sk_wake_async(struct sock *sk, int how, int band)
 {
-        if (sk->sk_socket && sk->sk_socket->fasync_list)
+        if (sock_flag(sk, SOCK_FASYNC))
                sock_wake_async(sk->sk_socket, how, band);
 }
@@ -1492,6 +1528,8 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
                sk->sk_stamp = kt;
 }
+extern void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, struct sk_buff *skb);
 /**
 * sock_tx_timestamp - checks whether the outgoing packet is to be time stamped
 * @msg:        outgoing packet
diff --git a/include/net/tc_act/tc_skbedit.h b/include/net/tc_act/tc_skbedit.h
index 6abb3ed3ebf7..e103fe02f375 100644
--- a/include/net/tc_act/tc_skbedit.h
+++ b/include/net/tc_act/tc_skbedit.h
@@ -26,7 +26,9 @@ struct tcf_skbedit {
        struct tcf_common       common;
        u32                     flags;
        u32                     priority;
+        u32                     mark;
        u16                     queue_mapping;
+        /* XXX: 16-bit pad here? */
 };
 #define to_skbedit(pc) \
        container_of(pc, struct tcf_skbedit, common)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 03a49c703377..e2d2ca2509be 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -30,6 +30,7 @@
 #include <linux/dmaengine.h>
 #include <linux/crypto.h>
 #include <linux/cryptohash.h>
+#include <linux/kref.h>
 #include <net/inet_connection_sock.h>
 #include <net/inet_timewait_sock.h>
@@ -62,9 +63,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 /* Minimal accepted MSS. It is (60+60+8) - (20+20). */
 #define TCP_MIN_MSS             88U
-/* Minimal RCV_MSS. */
-#define TCP_MIN_RCVMSS          536U
 /* The least MTU to use for probing */
 #define TCP_BASE_MSS            512
@@ -167,6 +165,7 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOPT_SACK             5       /* SACK Block */
 #define TCPOPT_TIMESTAMP        8       /* Better RTT estimations/PAWS */
 #define TCPOPT_MD5SIG           19      /* MD5 Signature (RFC2385) */
+#define TCPOPT_COOKIE           253     /* Cookie extension (experimental) */
 /*
 *     TCP option lengths
@@ -177,6 +176,10 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOLEN_SACK_PERM      2
 #define TCPOLEN_TIMESTAMP      10
 #define TCPOLEN_MD5SIG         18
+#define TCPOLEN_COOKIE_BASE    2        /* Cookie-less header extension */
+#define TCPOLEN_COOKIE_PAIR    3        /* Cookie pair header extension */
+#define TCPOLEN_COOKIE_MIN     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MIN)
+#define TCPOLEN_COOKIE_MAX     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MAX)
 /* But this is what stacks really send out. */
 #define TCPOLEN_TSTAMP_ALIGNED          12
@@ -237,6 +240,7 @@ extern int sysctl_tcp_base_mss;
 extern int sysctl_tcp_workaround_signed_windows;
 extern int sysctl_tcp_slow_start_after_idle;
 extern int sysctl_tcp_max_ssthresh;
+extern int sysctl_tcp_cookie_size;
 extern atomic_t tcp_memory_allocated;
 extern struct percpu_counter tcp_sockets_allocated;
@@ -343,11 +347,6 @@ static inline void tcp_dec_quickack_mode(struct sock *sk,
 extern void tcp_enter_quickack_mode(struct sock *sk);
-static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
-{
-        rx_opt->tstamp_ok = rx_opt->sack_ok = rx_opt->wscale_ok = rx_opt->snd_wscale = 0;
-}
 #define TCP_ECN_OK              1
 #define TCP_ECN_QUEUE_CWR       2
 #define TCP_ECN_DEMAND_CWR      4
@@ -359,8 +358,7 @@ TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
                inet_rsk(req)->ecn_ok = 1;
 }
-enum tcp_tw_status
+enum tcp_tw_status {
-{
        TCP_TW_SUCCESS = 0,
        TCP_TW_RST = 1,
        TCP_TW_ACK = 2,
@@ -409,7 +407,9 @@ extern int			tcp_recvmsg(struct kiocb *iocb, struct sock *sk,
 extern void                     tcp_parse_options(struct sk_buff *skb,
                                                  struct tcp_options_received *opt_rx,
-                                                  int estab);
+                                                  u8 **hvpp,
+                                                  int estab,
+                                                  struct dst_entry *dst);
 extern u8                       *tcp_parse_md5sig_option(struct tcphdr *th);
@@ -443,7 +443,8 @@ extern int			tcp_connect(struct sock *sk);
 extern struct sk_buff *         tcp_make_synack(struct sock *sk,
                                                struct dst_entry *dst,
-                                                struct request_sock *req);
+                                                struct request_sock *req,
+                                                struct request_values *rvp);
 extern int                      tcp_disconnect(struct sock *sk, int flags);
@@ -1228,6 +1229,7 @@ static inline void tcp_write_queue_purge(struct sock *sk)
        while ((skb = __skb_dequeue(&sk->sk_write_queue)) != NULL)
                sk_wmem_free_skb(sk, skb);
        sk_mem_reclaim(sk);
+        tcp_clear_all_retrans_hints(tcp_sk(sk));
 }
 static inline struct sk_buff *tcp_write_queue_head(struct sock *sk)
@@ -1480,6 +1482,91 @@ struct tcp_request_sock_ops {
 #endif
 };
+/* Using SHA1 for now, define some constants.
+ */
+#define COOKIE_DIGEST_WORDS (SHA_DIGEST_WORDS)
+#define COOKIE_MESSAGE_WORDS (SHA_MESSAGE_BYTES / 4)
+#define COOKIE_WORKSPACE_WORDS (COOKIE_DIGEST_WORDS + COOKIE_MESSAGE_WORDS)
+extern int tcp_cookie_generator(u32 *bakery);
+/**
+ *      struct tcp_cookie_values - each socket needs extra space for the
+ *      cookies, together with (optional) space for any SYN data.
+ *
+ *      A tcp_sock contains a pointer to the current value, and this is
+ *      cloned to the tcp_timewait_sock.
+ *
+ * @cookie_pair:        variable data from the option exchange.
+ *
+ * @cookie_desired:     user specified tcpct_cookie_desired.  Zero
+ *                      indicates default (sysctl_tcp_cookie_size).
+ *                      After cookie sent, remembers size of cookie.
+ *                      Range 0, TCP_COOKIE_MIN to TCP_COOKIE_MAX.
+ *
+ * @s_data_desired:     user specified tcpct_s_data_desired.  When the
+ *                      constant payload is specified (@s_data_constant),
+ *                      holds its length instead.
+ *                      Range 0 to TCP_MSS_DESIRED.
+ *
+ * @s_data_payload:     constant data that is to be included in the
+ *                      payload of SYN or SYNACK segments when the
+ *                      cookie option is present.
+ */
+struct tcp_cookie_values {
+        struct kref     kref;
+        u8              cookie_pair[TCP_COOKIE_PAIR_SIZE];
+        u8              cookie_pair_size;
+        u8              cookie_desired;
+        u16             s_data_desired:11,
+                        s_data_constant:1,
+                        s_data_in:1,
+                        s_data_out:1,
+                        s_data_unused:2;
+        u8              s_data_payload[0];
+};
+static inline void tcp_cookie_values_release(struct kref *kref)
+{
+        kfree(container_of(kref, struct tcp_cookie_values, kref));
+}
+/* The length of constant payload data.  Note that s_data_desired is
+ * overloaded, depending on s_data_constant: either the length of constant
+ * data (returned here) or the limit on variable data.
+ */
+static inline int tcp_s_data_size(const struct tcp_sock *tp)
+{
+        return (tp->cookie_values != NULL && tp->cookie_values->s_data_constant)
+                ? tp->cookie_values->s_data_desired
+                : 0;
+}
+/**
+ *      struct tcp_extend_values - tcp_ipv?.c to tcp_output.c workspace.
+ *
+ *      As tcp_request_sock has already been extended in other places, the
+ *      only remaining method is to pass stack values along as function
+ *      parameters.  These parameters are not needed after sending SYNACK.
+ *
+ * @cookie_bakery:      cryptographic secret and message workspace.
+ *
+ * @cookie_plus:        bytes in authenticator/cookie option, copied from
+ *                      struct tcp_options_received (above).
+ */
+struct tcp_extend_values {
+        struct request_values           rv;
+        u32                             cookie_bakery[COOKIE_WORKSPACE_WORDS];
+        u8                              cookie_plus:6,
+                                        cookie_out_never:1,
+                                        cookie_in_always:1;
+};
+static inline struct tcp_extend_values *tcp_xv(struct request_values *rvp)
+{
+        return (struct tcp_extend_values *)rvp;
+}
 extern void tcp_v4_init(void);
 extern void tcp_init(void);
diff --git a/include/net/udp.h b/include/net/udp.h
index f98abd2ce709..5348d80b25bb 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -50,16 +50,49 @@ struct udp_skb_cb {
 };
 #define UDP_SKB_CB(__skb)       ((struct udp_skb_cb *)((__skb)->cb))
+/**
+ *      struct udp_hslot - UDP hash slot
+ *
+ *      @head:  head of list of sockets
+ *      @count: number of sockets in 'head' list
+ *      @lock:  spinlock protecting changes to head/count
+ */
 struct udp_hslot {
        struct hlist_nulls_head head;
+        int                     count;
        spinlock_t              lock;
 } __attribute__((aligned(2 * sizeof(long))));
+/**
+ *      struct udp_table - UDP table
+ *
+ *      @hash:  hash table, sockets are hashed on (local port)
+ *      @hash2: hash table, sockets are hashed on (local port, local address)
+ *      @mask:  number of slots in hash tables, minus 1
+ *      @log:   log2(number of slots in hash table)
+ */
 struct udp_table {
-        struct udp_hslot        hash[UDP_HTABLE_SIZE];
+        struct udp_hslot        *hash;
+        struct udp_hslot        *hash2;
+        unsigned int            mask;
+        unsigned int            log;
 };
 extern struct udp_table udp_table;
-extern void udp_table_init(struct udp_table *);
+extern void udp_table_init(struct udp_table *, const char *);
+static inline struct udp_hslot *udp_hashslot(struct udp_table *table,
+                                             struct net *net, unsigned num)
+{
+        return &table->hash[udp_hashfn(net, num, table->mask)];
+}
+/*
+ * For secondary hash, net_hash_mix() is performed before calling
+ * udp_hashslot2(), this explains difference with udp_hashslot()
+ */
+static inline struct udp_hslot *udp_hashslot2(struct udp_table *table,
+                                              unsigned int hash)
+{
+        return &table->hash2[hash & table->mask];
+}
 /* Note: this must match 'valbool' in sock_setsockopt */
 #define UDP_CSUM_NOXMIT         1
@@ -125,7 +158,8 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
 }
 extern int      udp_lib_get_port(struct sock *sk, unsigned short snum,
-                int (*)(const struct sock*,const struct sock*));
+                int (*)(const struct sock *,const struct sock *),
+                unsigned int hash2_nulladdr);
 /* net/ipv4/udp.c */
 extern int      udp_get_port(struct sock *sk, unsigned short snum,
diff --git a/include/net/wext.h b/include/net/wext.h
index 3f2b94de2cfa..4f6e7423174c 100644
--- a/include/net/wext.h
+++ b/include/net/wext.h
@@ -1,29 +1,19 @@
 #ifndef __NET_WEXT_H
 #define __NET_WEXT_H
-/*
+#include <net/iw_handler.h>
- * wireless extensions interface to the core code
- */
 struct net;
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_WEXT_CORE
-extern int wext_proc_init(struct net *net);
-extern void wext_proc_exit(struct net *net);
 extern int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
                             void __user *arg);
 extern int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
                                    unsigned long arg);
 extern struct iw_statistics *get_wireless_stats(struct net_device *dev);
+extern int call_commit_handler(struct net_device *dev);
 #else
-static inline int wext_proc_init(struct net *net)
-{
-        return 0;
-}
-static inline void wext_proc_exit(struct net *net)
-{
-        return;
-}
 static inline int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
                                    void __user *arg)
 {
@@ -36,4 +26,35 @@ static inline int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
 }
 #endif
+#ifdef CONFIG_WEXT_PROC
+extern int wext_proc_init(struct net *net);
+extern void wext_proc_exit(struct net *net);
+#else
+static inline int wext_proc_init(struct net *net)
+{
+        return 0;
+}
+static inline void wext_proc_exit(struct net *net)
+{
+        return;
+}
+#endif
+#ifdef CONFIG_WEXT_PRIV
+int ioctl_private_call(struct net_device *dev, struct iwreq *iwr,
+                       unsigned int cmd, struct iw_request_info *info,
+                       iw_handler handler);
+int compat_private_call(struct net_device *dev, struct iwreq *iwr,
+                        unsigned int cmd, struct iw_request_info *info,
+                        iw_handler handler);
+int iw_handler_get_private(struct net_device *          dev,
+                           struct iw_request_info *     info,
+                           union iwreq_data *           wrqu,
+                           char *                       extra);
+#else
+#define ioctl_private_call NULL
+#define compat_private_call NULL
+#endif
 #endif /* __NET_WEXT_H */
diff --git a/include/net/wimax.h b/include/net/wimax.h
index 2af7bf839f23..d69c4a7a1267 100644
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
@@ -195,6 +195,12 @@
 *    defining the `struct nla_policy` for each message, it has to have
 *    an array size of WIMAX_GNL_ATTR_MAX+1.
 *
+ * The op_*() function pointers will not be called if the wimax_dev is
+ * in a state <= %WIMAX_ST_UNINITIALIZED. The exception is:
+ *
+ * - op_reset: can be called at any time after wimax_dev_add() has
+ *   been called.
+ *
 * THE PIPE INTERFACE:
 *
 * This interface is kept intentionally simple. The driver can send
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index 547b1e271ac9..85926231c07a 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -34,20 +34,32 @@ struct wpan_phy {
         */
        u8 current_channel;
        u8 current_page;
-        u32 channels_supported;
+        u32 channels_supported[32];
        u8 transmit_power;
        u8 cca_mode;
        struct device dev;
        int idx;
+        struct net_device *(*add_iface)(struct wpan_phy *phy,
+                        const char *name);
+        void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);
        char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
 };
+#define to_phy(_dev)    container_of(_dev, struct wpan_phy, dev)
 struct wpan_phy *wpan_phy_alloc(size_t priv_size);
-int wpan_phy_register(struct device *parent, struct wpan_phy *phy);
+static inline void wpan_phy_set_dev(struct wpan_phy *phy, struct device *dev)
+{
+        phy->dev.parent = dev;
+}
+int wpan_phy_register(struct wpan_phy *phy);
 void wpan_phy_unregister(struct wpan_phy *phy);
 void wpan_phy_free(struct wpan_phy *phy);
+/* Same semantics as for class_for_each_device */
+int wpan_phy_for_each(int (*fn)(struct wpan_phy *phy, void *data), void *data);
 static inline void *wpan_phy_priv(struct wpan_phy *phy)
 {
@@ -56,6 +68,12 @@ static inline void *wpan_phy_priv(struct wpan_phy *phy)
 }
 struct wpan_phy *wpan_phy_find(const char *str);
+static inline void wpan_phy_put(struct wpan_phy *phy)
+{
+        put_device(&phy->dev);
+}
 static inline const char *wpan_phy_name(struct wpan_phy *phy)
 {
        return dev_name(&phy->dev);
diff --git a/include/net/x25.h b/include/net/x25.h
index 2cda04011568..9baa07dc7d17 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -287,8 +287,14 @@ extern unsigned long x25_display_timer(struct sock *);
 extern void x25_check_rbuf(struct sock *);
 /* sysctl_net_x25.c */
+#ifdef CONFIG_SYSCTL
 extern void x25_register_sysctl(void);
 extern void x25_unregister_sysctl(void);
+#else
+static inline void x25_register_sysctl(void) {};
+static inline void x25_unregister_sysctl(void) {};
+#endif /* CONFIG_SYSCTL */
 struct x25_skb_cb {
        unsigned flags;
 };
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 223e90a44824..6d85861ab990 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -19,6 +19,9 @@
 #include <net/route.h>
 #include <net/ipv6.h>
 #include <net/ip6_fib.h>
+#include <linux/interrupt.h>
 #ifdef CONFIG_XFRM_STATISTICS
 #include <net/snmp.h>
 #endif
@@ -121,8 +124,7 @@ struct xfrm_state_walk {
 };
 /* Full description of state of transformer. */
-struct xfrm_state
+struct xfrm_state {
-{
 #ifdef CONFIG_NET_NS
        struct net              *xs_net;
 #endif
@@ -160,7 +162,7 @@ struct xfrm_state
        struct xfrm_lifetime_cfg lft;
        /* Data for transformer */
-        struct xfrm_algo        *aalg;
+        struct xfrm_algo_auth   *aalg;
        struct xfrm_algo        *ealg;
        struct xfrm_algo        *calg;
        struct xfrm_algo_aead   *aead;
@@ -199,7 +201,7 @@ struct xfrm_state
        struct xfrm_stats       stats;
        struct xfrm_lifetime_cur curlft;
-        struct timer_list       timer;
+        struct tasklet_hrtimer  mtimer;
        /* Last used time */
        unsigned long           lastused;
@@ -237,8 +239,7 @@ enum {
 };
 /* callback structure passed from either netlink or pfkey */
-struct km_event
+struct km_event {
-{
        union {
                u32 hard;
                u32 proto;
@@ -313,8 +314,7 @@ extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
 extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
-struct xfrm_type
+struct xfrm_type {
-{
        char                    *description;
        struct module           *owner;
        __u8                    proto;
@@ -420,8 +420,7 @@ static inline struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, int ipp
                return x->inner_mode_iaf;
 }
-struct xfrm_tmpl
+struct xfrm_tmpl {
-{
 /* id in template is interpreted as:
 * daddr - destination of tunnel, may be zero for transport mode.
 * spi   - zero to acquire spi. Not zero if spi is static, then
@@ -468,8 +467,7 @@ struct xfrm_policy_walk {
        u32 seq;
 };
-struct xfrm_policy
+struct xfrm_policy {
-{
 #ifdef CONFIG_NET_NS
        struct net              *xp_net;
 #endif
@@ -538,8 +536,7 @@ struct xfrm_migrate {
 /* default seq threshold size */
 #define XFRM_AE_SEQT_SIZE               2
-struct xfrm_mgr
+struct xfrm_mgr {
-{
        struct list_head        list;
        char                    *id;
        int                     (*notify)(struct xfrm_state *x, struct km_event *c);
@@ -626,8 +623,7 @@ struct xfrm_spi_skb_cb {
 #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0]))
 /* Audit Information */
-struct xfrm_audit
+struct xfrm_audit {
-{
        u32     secid;
        uid_t   loginuid;
        u32     sessionid;
@@ -871,8 +867,7 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ct
 * bundles differing by session id. All the bundles grow from a parent
 * policy rule.
 */
-struct xfrm_dst
+struct xfrm_dst {
-{
        union {
                struct dst_entry        dst;
                struct rtable           rt;
@@ -907,8 +902,7 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
 extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
-struct sec_path
+struct sec_path {
-{
        atomic_t                refcnt;
        int                     len;
        struct xfrm_state       *xvec[XFRM_MAX_DEPTH];
@@ -1500,9 +1494,6 @@ struct scatterlist;
 typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *,
                              unsigned int);
-extern int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *tfm,
-                        int offset, int len, icv_update_fn_t icv_update);
 static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b,
                                int family)
 {
@@ -1541,12 +1532,22 @@ static inline int xfrm_alg_len(struct xfrm_algo *alg)
        return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
 }
+static inline int xfrm_alg_auth_len(struct xfrm_algo_auth *alg)
+{
+        return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
+}
 #ifdef CONFIG_XFRM_MIGRATE
 static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig)
 {
        return kmemdup(orig, xfrm_alg_len(orig), GFP_KERNEL);
 }
+static inline struct xfrm_algo_auth *xfrm_algo_auth_clone(struct xfrm_algo_auth *orig)
+{
+        return kmemdup(orig, xfrm_alg_auth_len(orig), GFP_KERNEL);
+}
 static inline void xfrm_states_put(struct xfrm_state **states, int n)
 {
        int i;
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
index fd054a344324..e9dd9369ecb9 100644
--- a/include/sound/Kbuild
+++ b/include/sound/Kbuild
@@ -2,7 +2,6 @@ header-y += asound_fm.h
 header-y += hdsp.h
 header-y += hdspm.h
 header-y += sfnt_info.h
-header-y += sscape_ioctl.h
 unifdef-y += asequencer.h
 unifdef-y += asound.h
diff --git a/include/sound/aci.h b/include/sound/aci.h
new file mode 100644
index 000000000000..ee639d355ef0
--- /dev/null
+++ b/include/sound/aci.h
@@ -0,0 +1,90 @@
+#ifndef _ACI_H_
+#define _ACI_H_
+#define ACI_REG_COMMAND         0       /* write register offset */
+#define ACI_REG_STATUS          1       /* read register offset */
+#define ACI_REG_BUSY            2       /* busy register offset */
+#define ACI_REG_RDS             2       /* PCM20: RDS register offset */
+#define ACI_MINTIME             500     /* ACI time out limit */
+#define ACI_SET_MUTE            0x0d
+#define ACI_SET_POWERAMP        0x0f
+#define ACI_SET_TUNERMUTE       0xa3
+#define ACI_SET_TUNERMONO       0xa4
+#define ACI_SET_IDE             0xd0
+#define ACI_SET_WSS             0xd1
+#define ACI_SET_SOLOMODE        0xd2
+#define ACI_SET_PREAMP          0x03
+#define ACI_GET_PREAMP          0x21
+#define ACI_WRITE_TUNE          0xa7
+#define ACI_READ_TUNERSTEREO    0xa8
+#define ACI_READ_TUNERSTATION   0xa9
+#define ACI_READ_VERSION        0xf1
+#define ACI_READ_IDCODE         0xf2
+#define ACI_INIT                0xff
+#define ACI_STATUS              0xf0
+#define ACI_S_GENERAL           0x00
+#define ACI_ERROR_OP            0xdf
+/* ACI Mixer */
+/* These are the values for the right channel GET registers.
+   Add an offset of 0x01 for the left channel register.
+   (left=right+0x01) */
+#define ACI_GET_MASTER          0x03
+#define ACI_GET_MIC             0x05
+#define ACI_GET_LINE            0x07
+#define ACI_GET_CD              0x09
+#define ACI_GET_SYNTH           0x0b
+#define ACI_GET_PCM             0x0d
+#define ACI_GET_LINE1           0x10    /* Radio on PCM20 */
+#define ACI_GET_LINE2           0x12
+#define ACI_GET_EQ1             0x22    /* from Bass ... */
+#define ACI_GET_EQ2             0x24
+#define ACI_GET_EQ3             0x26
+#define ACI_GET_EQ4             0x28
+#define ACI_GET_EQ5             0x2a
+#define ACI_GET_EQ6             0x2c
+#define ACI_GET_EQ7             0x2e    /* ... to Treble */
+/* And these are the values for the right channel SET registers.
+   For left channel access you have to add an offset of 0x08.
+   MASTER is an exception, which needs an offset of 0x01 */
+#define ACI_SET_MASTER          0x00
+#define ACI_SET_MIC             0x30
+#define ACI_SET_LINE            0x31
+#define ACI_SET_CD              0x34
+#define ACI_SET_SYNTH           0x33
+#define ACI_SET_PCM             0x32
+#define ACI_SET_LINE1           0x35    /* Radio on PCM20 */
+#define ACI_SET_LINE2           0x36
+#define ACI_SET_EQ1             0x40    /* from Bass ... */
+#define ACI_SET_EQ2             0x41
+#define ACI_SET_EQ3             0x42
+#define ACI_SET_EQ4             0x43
+#define ACI_SET_EQ5             0x44
+#define ACI_SET_EQ6             0x45
+#define ACI_SET_EQ7             0x46    /* ... to Treble */
+struct snd_miro_aci {
+        unsigned long aci_port;
+        int aci_vendor;
+        int aci_product;
+        int aci_version;
+        int aci_amp;
+        int aci_preamp;
+        int aci_solomode;
+        struct mutex aci_mutex;
+};
+int snd_aci_cmd(struct snd_miro_aci *aci, int write1, int write2, int write3);
+struct snd_miro_aci *snd_aci_get_aci(void);
+#endif  /* _ACI_H_ */
diff --git a/include/sound/ak4113.h b/include/sound/ak4113.h
new file mode 100644
index 000000000000..8988edae1609
--- /dev/null
+++ b/include/sound/ak4113.h
@@ -0,0 +1,321 @@
+#ifndef __SOUND_AK4113_H
+#define __SOUND_AK4113_H
+/*
+ *  Routines for Asahi Kasei AK4113
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
+ *  Copyright (c) by Pavel Hofman <pavel.hofman@ivitera.com>,
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+/* AK4113 registers */
+/* power down */
+#define AK4113_REG_PWRDN        0x00
+/* format control */
+#define AK4113_REG_FORMAT       0x01
+/* input/output control */
+#define AK4113_REG_IO0          0x02
+/* input/output control */
+#define AK4113_REG_IO1          0x03
+/* interrupt0 mask */
+#define AK4113_REG_INT0_MASK    0x04
+/* interrupt1 mask */
+#define AK4113_REG_INT1_MASK    0x05
+/* DAT mask & DTS select */
+#define AK4113_REG_DATDTS       0x06
+/* receiver status 0 */
+#define AK4113_REG_RCS0         0x07
+/* receiver status 1 */
+#define AK4113_REG_RCS1         0x08
+/* receiver status 2 */
+#define AK4113_REG_RCS2         0x09
+/* RX channel status byte 0 */
+#define AK4113_REG_RXCSB0       0x0a
+/* RX channel status byte 1 */
+#define AK4113_REG_RXCSB1       0x0b
+/* RX channel status byte 2 */
+#define AK4113_REG_RXCSB2       0x0c
+/* RX channel status byte 3 */
+#define AK4113_REG_RXCSB3       0x0d
+/* RX channel status byte 4 */
+#define AK4113_REG_RXCSB4       0x0e
+/* burst preamble Pc byte 0 */
+#define AK4113_REG_Pc0          0x0f
+/* burst preamble Pc byte 1 */
+#define AK4113_REG_Pc1          0x10
+/* burst preamble Pd byte 0 */
+#define AK4113_REG_Pd0          0x11
+/* burst preamble Pd byte 1 */
+#define AK4113_REG_Pd1          0x12
+/* Q-subcode address + control */
+#define AK4113_REG_QSUB_ADDR    0x13
+/* Q-subcode track */
+#define AK4113_REG_QSUB_TRACK   0x14
+/* Q-subcode index */
+#define AK4113_REG_QSUB_INDEX   0x15
+/* Q-subcode minute */
+#define AK4113_REG_QSUB_MINUTE  0x16
+/* Q-subcode second */
+#define AK4113_REG_QSUB_SECOND  0x17
+/* Q-subcode frame */
+#define AK4113_REG_QSUB_FRAME   0x18
+/* Q-subcode zero */
+#define AK4113_REG_QSUB_ZERO    0x19
+/* Q-subcode absolute minute */
+#define AK4113_REG_QSUB_ABSMIN  0x1a
+/* Q-subcode absolute second */
+#define AK4113_REG_QSUB_ABSSEC  0x1b
+/* Q-subcode absolute frame */
+#define AK4113_REG_QSUB_ABSFRM  0x1c
+/* sizes */
+#define AK4113_REG_RXCSB_SIZE   ((AK4113_REG_RXCSB4-AK4113_REG_RXCSB0)+1)
+#define AK4113_REG_QSUB_SIZE    ((AK4113_REG_QSUB_ABSFRM-AK4113_REG_QSUB_ADDR)\
+                +1)
+#define AK4113_WRITABLE_REGS    (AK4113_REG_DATDTS + 1)
+/* AK4113_REG_PWRDN bits */
+/* Channel Status Select */
+#define AK4113_CS12             (1<<7)
+/* Block Start & C/U Output Mode */
+#define AK4113_BCU              (1<<6)
+/* Master Clock Operation Select */
+#define AK4113_CM1              (1<<5)
+/* Master Clock Operation Select */
+#define AK4113_CM0              (1<<4)
+/* Master Clock Frequency Select */
+#define AK4113_OCKS1            (1<<3)
+/* Master Clock Frequency Select */
+#define AK4113_OCKS0            (1<<2)
+/* 0 = power down, 1 = normal operation */
+#define AK4113_PWN              (1<<1)
+/* 0 = reset & initialize (except thisregister), 1 = normal operation */
+#define AK4113_RST              (1<<0)
+/* AK4113_REQ_FORMAT bits */
+/* V/TX Output select: 0 = Validity Flag Output, 1 = TX */
+#define AK4113_VTX              (1<<7)
+/* Audio Data Control */
+#define AK4113_DIF2             (1<<6)
+/* Audio Data Control */
+#define AK4113_DIF1             (1<<5)
+/* Audio Data Control */
+#define AK4113_DIF0             (1<<4)
+/* Deemphasis Autodetect Enable (1 = enable) */
+#define AK4113_DEAU             (1<<3)
+/* 32kHz-48kHz Deemphasis Control */
+#define AK4113_DEM1             (1<<2)
+/* 32kHz-48kHz Deemphasis Control */
+#define AK4113_DEM0             (1<<1)
+#define AK4113_DEM_OFF          (AK4113_DEM0)
+#define AK4113_DEM_44KHZ        (0)
+#define AK4113_DEM_48KHZ        (AK4113_DEM1)
+#define AK4113_DEM_32KHZ        (AK4113_DEM0|AK4113_DEM1)
+/* STDO: 16-bit, right justified */
+#define AK4113_DIF_16R          (0)
+/* STDO: 18-bit, right justified */
+#define AK4113_DIF_18R          (AK4113_DIF0)
+/* STDO: 20-bit, right justified */
+#define AK4113_DIF_20R          (AK4113_DIF1)
+/* STDO: 24-bit, right justified */
+#define AK4113_DIF_24R          (AK4113_DIF1|AK4113_DIF0)
+/* STDO: 24-bit, left justified */
+#define AK4113_DIF_24L          (AK4113_DIF2)
+/* STDO: I2S */
+#define AK4113_DIF_24I2S        (AK4113_DIF2|AK4113_DIF0)
+/* STDO: 24-bit, left justified; LRCLK, BICK = Input */
+#define AK4113_DIF_I24L         (AK4113_DIF2|AK4113_DIF1)
+/* STDO: I2S;  LRCLK, BICK = Input */
+#define AK4113_DIF_I24I2S       (AK4113_DIF2|AK4113_DIF1|AK4113_DIF0)
+/* AK4113_REG_IO0 */
+/* XTL1=0,XTL0=0 -> 11.2896Mhz; XTL1=0,XTL0=1 -> 12.288Mhz */
+#define AK4113_XTL1             (1<<6)
+/* XTL1=1,XTL0=0 -> 24.576Mhz; XTL1=1,XTL0=1 -> use channel status */
+#define AK4113_XTL0             (1<<5)
+/* Block Start Signal Output: 0 = U-bit, 1 = C-bit (req. BCU = 1) */
+#define AK4113_UCE              (1<<4)
+/* TX Output Enable (1 = enable) */
+#define AK4113_TXE              (1<<3)
+/* Output Through Data Selector for TX pin */
+#define AK4113_OPS2             (1<<2)
+/* Output Through Data Selector for TX pin */
+#define AK4113_OPS1             (1<<1)
+/* Output Through Data Selector for TX pin */
+#define AK4113_OPS0             (1<<0)
+/* 11.2896 MHz ref. Xtal freq. */
+#define AK4113_XTL_11_2896M     (0)
+/* 12.288 MHz ref. Xtal freq. */
+#define AK4113_XTL_12_288M      (AK4113_XTL0)
+/* 24.576 MHz ref. Xtal freq. */
+#define AK4113_XTL_24_576M      (AK4113_XTL1)
+/* AK4113_REG_IO1 */
+/* Interrupt 0 pin Hold */
+#define AK4113_EFH1             (1<<7)
+/* Interrupt 0 pin Hold */
+#define AK4113_EFH0             (1<<6)
+#define AK4113_EFH_512LRCLK     (0)
+#define AK4113_EFH_1024LRCLK    (AK4113_EFH0)
+#define AK4113_EFH_2048LRCLK    (AK4113_EFH1)
+#define AK4113_EFH_4096LRCLK    (AK4113_EFH1|AK4113_EFH0)
+/* PLL Lock Time: 0 = 384/fs, 1 = 1/fs */
+#define AK4113_FAST             (1<<5)
+/* MCKO2 Output Select: 0 = CMx/OCKSx, 1 = Xtal */
+#define AK4113_XMCK             (1<<4)
+/* MCKO2 Output Freq. Select: 0 = x1, 1 = x0.5  (req. XMCK = 1) */
+#define AK4113_DIV              (1<<3)
+/* Input Recovery Data Select */
+#define AK4113_IPS2             (1<<2)
+/* Input Recovery Data Select */
+#define AK4113_IPS1             (1<<1)
+/* Input Recovery Data Select */
+#define AK4113_IPS0             (1<<0)
+#define AK4113_IPS(x)           ((x)&7)
+/* AK4113_REG_INT0_MASK && AK4113_REG_INT1_MASK*/
+/* mask enable for QINT bit */
+#define AK4113_MQI              (1<<7)
+/* mask enable for AUTO bit */
+#define AK4113_MAUT             (1<<6)
+/* mask enable for CINT bit */
+#define AK4113_MCIT             (1<<5)
+/* mask enable for UNLOCK bit */
+#define AK4113_MULK             (1<<4)
+/* mask enable for V bit */
+#define AK4113_V                (1<<3)
+/* mask enable for STC bit */
+#define AK4113_STC              (1<<2)
+/* mask enable for AUDN bit */
+#define AK4113_MAN              (1<<1)
+/* mask enable for PAR bit */
+#define AK4113_MPR              (1<<0)
+/* AK4113_REG_DATDTS */
+/* DAT Start ID Counter */
+#define AK4113_DCNT             (1<<4)
+/* DTS-CD 16-bit Sync Word Detect */
+#define AK4113_DTS16            (1<<3)
+/* DTS-CD 14-bit Sync Word Detect */
+#define AK4113_DTS14            (1<<2)
+/* mask enable for DAT bit (if 1, no INT1 effect */
+#define AK4113_MDAT1            (1<<1)
+/* mask enable for DAT bit (if 1, no INT0 effect */
+#define AK4113_MDAT0            (1<<0)
+/* AK4113_REG_RCS0 */
+/* Q-subcode buffer interrupt, 0 = no change, 1 = changed */
+#define AK4113_QINT             (1<<7)
+/* Non-PCM or DTS stream auto detection, 0 = no detect, 1 = detect */
+#define AK4113_AUTO             (1<<6)
+/* channel status buffer interrupt, 0 = no change, 1 = change */
+#define AK4113_CINT             (1<<5)
+/* PLL lock status, 0 = lock, 1 = unlock */
+#define AK4113_UNLCK            (1<<4)
+/* Validity bit, 0 = valid, 1 = invalid */
+#define AK4113_V                (1<<3)
+/* sampling frequency or Pre-emphasis change, 0 = no detect, 1 = detect */
+#define AK4113_STC              (1<<2)
+/* audio bit output, 0 = audio, 1 = non-audio */
+#define AK4113_AUDION           (1<<1)
+/* parity error or biphase error status, 0 = no error, 1 = error */
+#define AK4113_PAR              (1<<0)
+/* AK4113_REG_RCS1 */
+/* sampling frequency detection */
+#define AK4113_FS3              (1<<7)
+#define AK4113_FS2              (1<<6)
+#define AK4113_FS1              (1<<5)
+#define AK4113_FS0              (1<<4)
+/* Pre-emphasis detect, 0 = OFF, 1 = ON */
+#define AK4113_PEM              (1<<3)
+/* DAT Start ID Detect, 0 = no detect, 1 = detect */
+#define AK4113_DAT              (1<<2)
+/* DTS-CD bit audio stream detect, 0 = no detect, 1 = detect */
+#define AK4113_DTSCD            (1<<1)
+/* Non-PCM bit stream detection, 0 = no detect, 1 = detect */
+#define AK4113_NPCM             (1<<0)
+#define AK4113_FS_8000HZ        (AK4113_FS3|AK4113_FS0)
+#define AK4113_FS_11025HZ       (AK4113_FS2|AK4113_FS0)
+#define AK4113_FS_16000HZ       (AK4113_FS2|AK4113_FS1|AK4113_FS0)
+#define AK4113_FS_22050HZ       (AK4113_FS2)
+#define AK4113_FS_24000HZ       (AK4113_FS2|AK4113_FS1)
+#define AK4113_FS_32000HZ       (AK4113_FS1|AK4113_FS0)
+#define AK4113_FS_44100HZ       (0)
+#define AK4113_FS_48000HZ       (AK4113_FS1)
+#define AK4113_FS_64000HZ       (AK4113_FS3|AK4113_FS1|AK4113_FS0)
+#define AK4113_FS_88200HZ       (AK4113_FS3)
+#define AK4113_FS_96000HZ       (AK4113_FS3|AK4113_FS1)
+#define AK4113_FS_176400HZ      (AK4113_FS3|AK4113_FS2)
+#define AK4113_FS_192000HZ      (AK4113_FS3|AK4113_FS2|AK4113_FS1)
+/* AK4113_REG_RCS2 */
+/* CRC for Q-subcode, 0 = no error, 1 = error */
+#define AK4113_QCRC             (1<<1)
+/* CRC for channel status, 0 = no error, 1 = error */
+#define AK4113_CCRC             (1<<0)
+/* flags for snd_ak4113_check_rate_and_errors() */
+#define AK4113_CHECK_NO_STAT    (1<<0)  /* no statistics */
+#define AK4113_CHECK_NO_RATE    (1<<1)  /* no rate check */
+#define AK4113_CONTROLS         13
+typedef void (ak4113_write_t)(void *private_data, unsigned char addr,
+                unsigned char data);
+typedef unsigned char (ak4113_read_t)(void *private_data, unsigned char addr);
+struct ak4113 {
+        struct snd_card *card;
+        ak4113_write_t *write;
+        ak4113_read_t *read;
+        void *private_data;
+        unsigned int init:1;
+        spinlock_t lock;
+        unsigned char regmap[AK4113_WRITABLE_REGS];
+        struct snd_kcontrol *kctls[AK4113_CONTROLS];
+        struct snd_pcm_substream *substream;
+        unsigned long parity_errors;
+        unsigned long v_bit_errors;
+        unsigned long qcrc_errors;
+        unsigned long ccrc_errors;
+        unsigned char rcs0;
+        unsigned char rcs1;
+        unsigned char rcs2;
+        struct delayed_work work;
+        unsigned int check_flags;
+        void *change_callback_private;
+        void (*change_callback)(struct ak4113 *ak4113, unsigned char c0,
+                        unsigned char c1);
+};
+int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
+                ak4113_write_t *write,
+                const unsigned char pgm[AK4113_WRITABLE_REGS],
+                void *private_data, struct ak4113 **r_ak4113);
+void snd_ak4113_reg_write(struct ak4113 *ak4113, unsigned char reg,
+                unsigned char mask, unsigned char val);
+void snd_ak4113_reinit(struct ak4113 *ak4113);
+int snd_ak4113_build(struct ak4113 *ak4113,
+                struct snd_pcm_substream *capture_substream);
+int snd_ak4113_external_rate(struct ak4113 *ak4113);
+int snd_ak4113_check_rate_and_errors(struct ak4113 *ak4113, unsigned int flags);
+#endif /* __SOUND_AK4113_H */
diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index d293d36a66b8..3ce69fd92523 100644
--- a/include/sound/ak4114.h
+++ b/include/sound/ak4114.h
@@ -95,13 +95,13 @@
 /* AK4114_REG_IO0 */
 #define AK4114_TX1E             (1<<7)  /* TX1 Output Enable (1 = enable) */
-#define AK4114_OPS12            (1<<2)  /* Output Though Data Selector for TX1 pin */
+#define AK4114_OPS12            (1<<6)  /* Output Data Selector for TX1 pin */
-#define AK4114_OPS11            (1<<1)  /* Output Though Data Selector for TX1 pin */
+#define AK4114_OPS11            (1<<5)  /* Output Data Selector for TX1 pin */
-#define AK4114_OPS10            (1<<0)  /* Output Though Data Selector for TX1 pin */
+#define AK4114_OPS10            (1<<4)  /* Output Data Selector for TX1 pin */
 #define AK4114_TX0E             (1<<3)  /* TX0 Output Enable (1 = enable) */
-#define AK4114_OPS02            (1<<2)  /* Output Though Data Selector for TX0 pin */
+#define AK4114_OPS02            (1<<2)  /* Output Data Selector for TX0 pin */
-#define AK4114_OPS01            (1<<1)  /* Output Though Data Selector for TX0 pin */
+#define AK4114_OPS01            (1<<1)  /* Output Data Selector for TX0 pin */
-#define AK4114_OPS00            (1<<0)  /* Output Though Data Selector for TX0 pin */
+#define AK4114_OPS00            (1<<0)  /* Output Data Selector for TX0 pin */
 /* AK4114_REG_IO1 */
 #define AK4114_EFH1             (1<<7)  /* Interrupt 0 pin Hold */
diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
index 891cf1aea8b1..030b87c2f6d4 100644
--- a/include/sound/ak4xxx-adda.h
+++ b/include/sound/ak4xxx-adda.h
@@ -68,7 +68,7 @@ struct snd_akm4xxx {
        enum {
                SND_AK4524, SND_AK4528, SND_AK4529,
                SND_AK4355, SND_AK4358, SND_AK4381,
-                SND_AK5365
+                SND_AK5365, SND_AK4620,
        } type;
        /* (array) information of combined codecs */
@@ -76,6 +76,9 @@ struct snd_akm4xxx {
        const struct snd_akm4xxx_adc_channel *adc_info;
        struct snd_ak4xxx_ops ops;
+        unsigned int num_chips;
+        unsigned int total_regs;
+        const char *name;
 };
 void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg,
diff --git a/include/sound/control.h b/include/sound/control.h
index ef96f07aa03b..112374dc0c58 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -56,7 +56,6 @@ struct snd_kcontrol_new {
 struct snd_kcontrol_volatile {
        struct snd_ctl_file *owner;     /* locked */
-        pid_t owner_pid;
        unsigned int access;    /* access rights */
 };
@@ -87,10 +86,12 @@ struct snd_kctl_event {
 #define snd_kctl_event(n) list_entry(n, struct snd_kctl_event, list)
+struct pid;
 struct snd_ctl_file {
        struct list_head list;          /* list of all control files */
        struct snd_card *card;
-        pid_t pid;
+        struct pid *pid;
        int prefer_pcm_subdevice;
        int prefer_rawmidi_subdevice;
        wait_queue_head_t change_sleep;
diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h
index 92647532c454..66d28c2cb53d 100644
--- a/include/sound/cs4231-regs.h
+++ b/include/sound/cs4231-regs.h
@@ -70,7 +70,6 @@
 #define AD1845_PWR_DOWN         0x1b    /* power down control */
 #define CS4235_LEFT_MASTER      0x1b    /* left master output control */
 #define CS4231_REC_FORMAT       0x1c    /* clock and data format - record - bits 7-0 MCE */
-#define CS4231_PLY_VAR_FREQ     0x1d    /* playback variable frequency */
 #define AD1845_CLOCK            0x1d    /* crystal clock select and total power down */
 #define CS4235_RIGHT_MASTER     0x1d    /* right master output control */
 #define CS4231_REC_UPR_CNT      0x1e    /* record upper count */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index de6d981de5d6..c83a4a79f16b 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -348,6 +348,8 @@ struct snd_pcm_group {		/* keep linked substreams */
        int count;
 };
+struct pid;
 struct snd_pcm_substream {
        struct snd_pcm *pcm;
        struct snd_pcm_str *pstr;
@@ -379,6 +381,7 @@ struct snd_pcm_substream {
        atomic_t mmap_count;
        unsigned int f_flags;
        void (*pcm_release)(struct snd_pcm_substream *);
+        struct pid *pid;
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
        /* -- OSS things -- */
        struct snd_pcm_oss_substream oss;
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index c23c26585700..2480e7d10dcf 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -46,6 +46,7 @@
 struct snd_rawmidi;
 struct snd_rawmidi_substream;
 struct snd_seq_port_info;
+struct pid;
 struct snd_rawmidi_ops {
        int (*open) (struct snd_rawmidi_substream * substream);
@@ -97,6 +98,7 @@ struct snd_rawmidi_substream {
        struct snd_rawmidi_str *pstr;
        char name[32];
        struct snd_rawmidi_runtime *runtime;
+        struct pid *pid;
        /* hardware layer */
        struct snd_rawmidi_ops *ops;
 };
diff --git a/include/sound/sh_dac_audio.h b/include/sound/sh_dac_audio.h
new file mode 100644
index 000000000000..f5deaf1ddb9f
--- /dev/null
+++ b/include/sound/sh_dac_audio.h
@@ -0,0 +1,21 @@
+/*
+ * SH_DAC specific configuration, for the dac_audio platform_device
+ *
+ * Copyright (C) 2009 Rafael Ignacio Zurita <rizurita@yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+#ifndef __INCLUDE_SH_DAC_AUDIO_H
+#define __INCLUDE_SH_DAC_AUDIO_H
+struct dac_audio_pdata {
+        int buffer_size;
+        int channel;
+        void (*start)(struct dac_audio_pdata *pd);
+        void (*stop)(struct dac_audio_pdata *pd);
+};
+#endif /* __INCLUDE_SH_DAC_AUDIO_H */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 97ca9af414dc..ca24e7f7a3f5 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -30,6 +30,7 @@ struct snd_pcm_substream;
 #define SND_SOC_DAIFMT_DSP_A            3 /* L data MSB after FRM LRC */
 #define SND_SOC_DAIFMT_DSP_B            4 /* L data MSB during FRM LRC */
 #define SND_SOC_DAIFMT_AC97             5 /* AC97 */
+#define SND_SOC_DAIFMT_PDM              6 /* Pulse density modulation */
 /* left and right justified also known as MSB and LSB respectively */
 #define SND_SOC_DAIFMT_MSB              SND_SOC_DAIFMT_LEFT_J
@@ -106,7 +107,7 @@ int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,
        int div_id, int div);
 int snd_soc_dai_set_pll(struct snd_soc_dai *dai,
-        int pll_id, unsigned int freq_in, unsigned int freq_out);
+        int pll_id, int source, unsigned int freq_in, unsigned int freq_out);
 /* Digital Audio interface formatting */
 int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
@@ -114,6 +115,10 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
 int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
        unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width);
+int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai,
+        unsigned int tx_num, unsigned int *tx_slot,
+        unsigned int rx_num, unsigned int *rx_slot);
 int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);
 /* Digital Audio Interface mute */
@@ -136,8 +141,8 @@ struct snd_soc_dai_ops {
         */
        int (*set_sysclk)(struct snd_soc_dai *dai,
                int clk_id, unsigned int freq, int dir);
-        int (*set_pll)(struct snd_soc_dai *dai,
+        int (*set_pll)(struct snd_soc_dai *dai, int pll_id, int source,
-                int pll_id, unsigned int freq_in, unsigned int freq_out);
+                unsigned int freq_in, unsigned int freq_out);
        int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);
        /*
@@ -148,6 +153,9 @@ struct snd_soc_dai_ops {
        int (*set_tdm_slot)(struct snd_soc_dai *dai,
                unsigned int tx_mask, unsigned int rx_mask,
                int slots, int slot_width);
+        int (*set_channel_map)(struct snd_soc_dai *dai,
+                unsigned int tx_num, unsigned int *tx_slot,
+                unsigned int rx_num, unsigned int *rx_slot);
        int (*set_tristate)(struct snd_soc_dai *dai, int tristate);
        /*
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index c1410e3191e3..c5c95e1da65b 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -206,6 +206,12 @@
        .get = snd_soc_dapm_get_enum_double, \
        .put = snd_soc_dapm_put_enum_double, \
        .private_value = (unsigned long)&xenum }
+#define SOC_DAPM_ENUM_VIRT(xname, xenum)                    \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_info_enum_double, \
+        .get = snd_soc_dapm_get_enum_virt, \
+        .put = snd_soc_dapm_put_enum_virt, \
+        .private_value = (unsigned long)&xenum }
 #define SOC_DAPM_VALUE_ENUM(xname, xenum) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
        .info = snd_soc_info_enum_double, \
@@ -260,6 +266,10 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_dapm_get_enum_virt(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
@@ -333,6 +343,10 @@ struct snd_soc_dapm_route {
        const char *sink;
        const char *control;
        const char *source;
+        /* Note: currently only supported for links where source is a supply */
+        int (*connected)(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink);
 };
 /* dapm audio path between two widgets */
@@ -349,6 +363,9 @@ struct snd_soc_dapm_path {
        u32 connect:1;  /* source and sink widgets are connected */
        u32 walked:1;   /* path has been walked */
+        int (*connected)(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink);
        struct list_head list_source;
        struct list_head list_sink;
        struct list_head list;
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 475cb7ed6bec..0d7718f9280d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -223,15 +223,15 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                               int addr_bits, int data_bits,
                               enum snd_soc_control_type control);
-#ifdef CONFIG_PM
-int snd_soc_suspend_device(struct device *dev);
-int snd_soc_resume_device(struct device *dev);
-#endif
 /* pcm <-> DAI connect */
 void snd_soc_free_pcms(struct snd_soc_device *socdev);
 int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
-int snd_soc_init_card(struct snd_soc_device *socdev);
+/* Utility functions to get clock rates from various things */
+int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
+int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
+int snd_soc_calc_bclk(int fs, int sample_size, int channels, int tdm_slots);
+int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);
 /* set runtime hw params */
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
@@ -333,6 +333,8 @@ struct snd_soc_jack_gpio {
        int debounce_time;
        struct snd_soc_jack *jack;
        struct work_struct work;
+        int (*jack_status_check)(void);
 };
 #endif
@@ -413,6 +415,7 @@ struct snd_soc_codec {
        unsigned int num_dai;
 #ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_codec_root;
        struct dentry *debugfs_reg;
        struct dentry *debugfs_pop_time;
        struct dentry *debugfs_dapm;
diff --git a/include/sound/sscape_ioctl.h b/include/sound/sscape_ioctl.h
deleted file mode 100644
index 0d8885969c64..000000000000
--- a/include/sound/sscape_ioctl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SSCAPE_IOCTL_H
-#define SSCAPE_IOCTL_H
-struct sscape_bootblock
-{
-  unsigned char code[256];
-  unsigned version;
-};
-#define SSCAPE_MICROCODE_SIZE  65536
-struct sscape_microcode
-{
-  unsigned char __user *code;
-};
-#define SND_SSCAPE_LOAD_BOOTB  _IOWR('P', 100, struct sscape_bootblock)
-#define SND_SSCAPE_LOAD_MCODE  _IOW ('P', 101, struct sscape_microcode)
-#endif
diff --git a/include/sound/tlv320dac33-plat.h b/include/sound/tlv320dac33-plat.h
new file mode 100644
index 000000000000..5858d06a7ffa
--- /dev/null
+++ b/include/sound/tlv320dac33-plat.h
@@ -0,0 +1,20 @@
+/*
+ * Platform header for Texas Instruments TLV320DAC33 codec driver
+ *
+ * Author:      Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ *
+ * Copyright:   (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __TLV320DAC33_PLAT_H
+#define __TLV320DAC33_PLAT_H
+struct tlv320dac33_platform_data {
+        int power_gpio;
+};
+#endif /* __TLV320DAC33_PLAT_H */
diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h
new file mode 100644
index 000000000000..e8c901e749d8
--- /dev/null
+++ b/include/sound/tpa6130a2-plat.h
@@ -0,0 +1,30 @@
+/*
+ * TPA6130A2 driver platform header
+ *
+ * Copyright (C) Nokia Corporation
+ *
+ * Written by Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#ifndef TPA6130A2_PLAT_H
+#define TPA6130A2_PLAT_H
+struct tpa6130a2_platform_data {
+        int power_gpio;
+};
+#endif
diff --git a/include/sound/wss.h b/include/sound/wss.h
index 6d65f322f1d5..fd01f22825cd 100644
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -154,7 +154,6 @@ int snd_wss_create(struct snd_card *card,
                      unsigned short hardware,
                      unsigned short hwshare,
                      struct snd_wss **rchip);
-int snd_wss_free(struct snd_wss *chip);
 int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
 int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
 int snd_wss_mixer(struct snd_wss *chip);