Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.

49 files changed, 1950 insertions, 533 deletions

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 0c5e72503b77..43750439c521 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -64,6 +64,11 @@ struct bt_security {
 
 #define BT_DEFER_SETUP  7
 
+#define BT_FLUSHABLE    8
+
+#define BT_FLUSHABLE_OFF        0
+#define BT_FLUSHABLE_ON         1
+
 #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)
 #define BT_ERR(fmt, arg...)  printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)
 #define BT_DBG(fmt, arg...)  pr_debug("%s: " fmt "\n" , __func__ , ## arg)
@@ -200,4 +205,32 @@ extern void bt_sysfs_cleanup(void);
 
 extern struct dentry *bt_debugfs;
 
+#ifdef CONFIG_BT_L2CAP
+int l2cap_init(void);
+void l2cap_exit(void);
+#else
+static inline int l2cap_init(void)
+{
+        return 0;
+}
+
+static inline void l2cap_exit(void)
+{
+}
+#endif
+
+#ifdef CONFIG_BT_SCO
+int sco_init(void);
+void sco_exit(void);
+#else
+static inline int sco_init(void)
+{
+        return 0;
+}
+
+static inline void sco_exit(void)
+{
+}
+#endif
+
 #endif /* __BLUETOOTH_H */
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 29a7a8ca0438..ec6acf2f1c0b 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -76,6 +76,14 @@ enum {
         HCI_INQUIRY,
 
         HCI_RAW,
+
+        HCI_SETUP,
+        HCI_AUTO_OFF,
+        HCI_MGMT,
+        HCI_PAIRABLE,
+        HCI_SERVICE_CACHE,
+        HCI_LINK_KEYS,
+        HCI_DEBUG_KEYS,
 };
 
 /* HCI ioctl defines */
@@ -111,6 +119,7 @@ enum {
 #define HCI_PAIRING_TIMEOUT     (60000) /* 60 seconds */
 #define HCI_IDLE_TIMEOUT        (6000)  /* 6 seconds */
 #define HCI_INIT_TIMEOUT        (10000) /* 10 seconds */
+#define HCI_CMD_TIMEOUT         (1000)  /* 1 seconds */
 
 /* HCI data types */
 #define HCI_COMMAND_PKT         0x01
@@ -150,6 +159,7 @@ enum {
 #define EDR_ESCO_MASK  (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5)
 
 /* ACL flags */
+#define ACL_START_NO_FLUSH      0x00
 #define ACL_CONT                0x01
 #define ACL_START               0x02
 #define ACL_ACTIVE_BCAST        0x04
@@ -159,6 +169,8 @@ enum {
 #define SCO_LINK        0x00
 #define ACL_LINK        0x01
 #define ESCO_LINK       0x02
+/* Low Energy links do not have defined link type. Use invented one */
+#define LE_LINK         0x80
 
 /* LMP features */
 #define LMP_3SLOT       0x01
@@ -183,17 +195,25 @@ enum {
 #define LMP_PSCHEME     0x02
 #define LMP_PCONTROL    0x04
 
+#define LMP_RSSI_INQ    0x40
 #define LMP_ESCO        0x80
 
 #define LMP_EV4         0x01
 #define LMP_EV5         0x02
+#define LMP_LE          0x40
 
 #define LMP_SNIFF_SUBR  0x02
+#define LMP_PAUSE_ENC   0x04
 #define LMP_EDR_ESCO_2M 0x20
 #define LMP_EDR_ESCO_3M 0x40
 #define LMP_EDR_3S_ESCO 0x80
 
+#define LMP_EXT_INQ     0x01
 #define LMP_SIMPLE_PAIR 0x08
+#define LMP_NO_FLUSH    0x40
+
+#define LMP_LSTO        0x01
+#define LMP_INQ_TX_PWR  0x02
 
 /* Connection modes */
 #define HCI_CM_ACTIVE   0x0000
@@ -225,6 +245,8 @@ enum {
 #define HCI_AT_GENERAL_BONDING_MITM     0x05
 
 /* -----  HCI Commands ---- */
+#define HCI_OP_NOP                      0x0000
+
 #define HCI_OP_INQUIRY                  0x0401
 struct hci_cp_inquiry {
         __u8     lap[3];
@@ -292,11 +314,19 @@ struct hci_cp_pin_code_reply {
         __u8     pin_len;
         __u8     pin_code[16];
 } __packed;
+struct hci_rp_pin_code_reply {
+        __u8     status;
+        bdaddr_t bdaddr;
+} __packed;
 
 #define HCI_OP_PIN_CODE_NEG_REPLY       0x040e
 struct hci_cp_pin_code_neg_reply {
         bdaddr_t bdaddr;
 } __packed;
+struct hci_rp_pin_code_neg_reply {
+        __u8     status;
+        bdaddr_t bdaddr;
+} __packed;
 
 #define HCI_OP_CHANGE_CONN_PTYPE        0x040f
 struct hci_cp_change_conn_ptype {
@@ -377,6 +407,31 @@ struct hci_cp_reject_sync_conn_req {
         __u8     reason;
 } __packed;
 
+#define HCI_OP_IO_CAPABILITY_REPLY      0x042b
+struct hci_cp_io_capability_reply {
+        bdaddr_t bdaddr;
+        __u8     capability;
+        __u8     oob_data;
+        __u8     authentication;
+} __packed;
+
+#define HCI_OP_USER_CONFIRM_REPLY               0x042c
+struct hci_cp_user_confirm_reply {
+        bdaddr_t bdaddr;
+} __packed;
+struct hci_rp_user_confirm_reply {
+        __u8     status;
+        bdaddr_t bdaddr;
+} __packed;
+
+#define HCI_OP_USER_CONFIRM_NEG_REPLY   0x042d
+
+#define HCI_OP_IO_CAPABILITY_NEG_REPLY  0x0434
+struct hci_cp_io_capability_neg_reply {
+        bdaddr_t bdaddr;
+        __u8     reason;
+} __packed;
+
 #define HCI_OP_SNIFF_MODE               0x0803
 struct hci_cp_sniff_mode {
         __le16   handle;
@@ -474,6 +529,12 @@ struct hci_cp_set_event_flt {
 #define HCI_CONN_SETUP_AUTO_OFF 0x01
 #define HCI_CONN_SETUP_AUTO_ON  0x02
 
+#define HCI_OP_DELETE_STORED_LINK_KEY   0x0c12
+struct hci_cp_delete_stored_link_key {
+        bdaddr_t bdaddr;
+        __u8     delete_all;
+} __packed;
+
 #define HCI_OP_WRITE_LOCAL_NAME         0x0c13
 struct hci_cp_write_local_name {
         __u8     name[248];
@@ -537,6 +598,8 @@ struct hci_cp_host_buffer_size {
         __le16   sco_max_pkt;
 } __packed;
 
+#define HCI_OP_WRITE_INQUIRY_MODE       0x0c45
+
 #define HCI_OP_READ_SSP_MODE            0x0c55
 struct hci_rp_read_ssp_mode {
         __u8     status;
@@ -548,6 +611,8 @@ struct hci_cp_write_ssp_mode {
         __u8     mode;
 } __packed;
 
+#define HCI_OP_READ_INQ_RSP_TX_POWER    0x0c58
+
 #define HCI_OP_READ_LOCAL_VERSION       0x1001
 struct hci_rp_read_local_version {
         __u8     status;
@@ -593,6 +658,47 @@ struct hci_rp_read_bd_addr {
         bdaddr_t bdaddr;
 } __packed;
 
+#define HCI_OP_LE_SET_EVENT_MASK        0x2001
+struct hci_cp_le_set_event_mask {
+        __u8     mask[8];
+} __packed;
+
+#define HCI_OP_LE_READ_BUFFER_SIZE      0x2002
+struct hci_rp_le_read_buffer_size {
+        __u8     status;
+        __le16   le_mtu;
+        __u8     le_max_pkt;
+} __packed;
+
+#define HCI_OP_LE_CREATE_CONN           0x200d
+struct hci_cp_le_create_conn {
+        __le16   scan_interval;
+        __le16   scan_window;
+        __u8     filter_policy;
+        __u8     peer_addr_type;
+        bdaddr_t peer_addr;
+        __u8     own_address_type;
+        __le16   conn_interval_min;
+        __le16   conn_interval_max;
+        __le16   conn_latency;
+        __le16   supervision_timeout;
+        __le16   min_ce_len;
+        __le16   max_ce_len;
+} __packed;
+
+#define HCI_OP_LE_CREATE_CONN_CANCEL    0x200e
+
+#define HCI_OP_LE_CONN_UPDATE           0x2013
+struct hci_cp_le_conn_update {
+        __le16   handle;
+        __le16   conn_interval_min;
+        __le16   conn_interval_max;
+        __le16   conn_latency;
+        __le16   supervision_timeout;
+        __le16   min_ce_len;
+        __le16   max_ce_len;
+} __packed;
+
 /* ---- HCI Events ---- */
 #define HCI_EV_INQUIRY_COMPLETE         0x01
 
@@ -833,6 +939,20 @@ struct hci_ev_io_capa_request {
         bdaddr_t bdaddr;
 } __packed;
 
+#define HCI_EV_IO_CAPA_REPLY            0x32
+struct hci_ev_io_capa_reply {
+        bdaddr_t bdaddr;
+        __u8     capability;
+        __u8     oob_data;
+        __u8     authentication;
+} __packed;
+
+#define HCI_EV_USER_CONFIRM_REQUEST     0x33
+struct hci_ev_user_confirm_req {
+        bdaddr_t        bdaddr;
+        __le32          passkey;
+} __packed;
+
 #define HCI_EV_SIMPLE_PAIR_COMPLETE     0x36
 struct hci_ev_simple_pair_complete {
         __u8     status;
@@ -845,6 +965,25 @@ struct hci_ev_remote_host_features {
         __u8     features[8];
 } __packed;
 
+#define HCI_EV_LE_META                  0x3e
+struct hci_ev_le_meta {
+        __u8     subevent;
+} __packed;
+
+/* Low energy meta events */
+#define HCI_EV_LE_CONN_COMPLETE         0x01
+struct hci_ev_le_conn_complete {
+        __u8     status;
+        __le16   handle;
+        __u8     role;
+        __u8     bdaddr_type;
+        bdaddr_t bdaddr;
+        __le16   interval;
+        __le16   latency;
+        __le16   supervision_timeout;
+        __u8     clk_accurancy;
+} __packed;
+
 /* Internal events generated by Bluetooth stack */
 #define HCI_EV_STACK_INTERNAL   0xfd
 struct hci_ev_stack_internal {
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d2cf88407690..441dadbf6a89 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -60,12 +60,28 @@ struct hci_conn_hash {
         spinlock_t       lock;
         unsigned int     acl_num;
         unsigned int     sco_num;
+        unsigned int     le_num;
 };
 
 struct bdaddr_list {
         struct list_head list;
         bdaddr_t bdaddr;
 };
+
+struct bt_uuid {
+        struct list_head list;
+        u8 uuid[16];
+        u8 svc_hint;
+};
+
+struct link_key {
+        struct list_head list;
+        bdaddr_t bdaddr;
+        u8 type;
+        u8 val[16];
+        u8 pin_len;
+};
+
 #define NUM_REASSEMBLY 4
 struct hci_dev {
         struct list_head list;
@@ -80,13 +96,18 @@ struct hci_dev {
         bdaddr_t        bdaddr;
         __u8            dev_name[248];
         __u8            dev_class[3];
+        __u8            major_class;
+        __u8            minor_class;
         __u8            features[8];
         __u8            commands[64];
         __u8            ssp_mode;
         __u8            hci_ver;
         __u16           hci_rev;
+        __u8            lmp_ver;
         __u16           manufacturer;
+        __le16          lmp_subver;
         __u16           voice_setting;
+        __u8            io_capability;
 
         __u16           pkt_type;
         __u16           esco_type;
@@ -102,18 +123,26 @@ struct hci_dev {
         atomic_t        cmd_cnt;
         unsigned int    acl_cnt;
         unsigned int    sco_cnt;
+        unsigned int    le_cnt;
 
         unsigned int    acl_mtu;
         unsigned int    sco_mtu;
+        unsigned int    le_mtu;
         unsigned int    acl_pkts;
         unsigned int    sco_pkts;
+        unsigned int    le_pkts;
 
-        unsigned long   cmd_last_tx;
         unsigned long   acl_last_tx;
         unsigned long   sco_last_tx;
+        unsigned long   le_last_tx;
 
         struct workqueue_struct *workqueue;
 
+        struct work_struct      power_on;
+        struct work_struct      power_off;
+        struct timer_list       off_timer;
+
+        struct timer_list       cmd_timer;
         struct tasklet_struct   cmd_task;
         struct tasklet_struct   rx_task;
         struct tasklet_struct   tx_task;
@@ -129,12 +158,17 @@ struct hci_dev {
         wait_queue_head_t       req_wait_q;
         __u32                   req_status;
         __u32                   req_result;
-        __u16                   req_last_cmd;
+
+        __u16                   init_last_cmd;
 
         struct inquiry_cache    inq_cache;
         struct hci_conn_hash    conn_hash;
         struct list_head        blacklist;
 
+        struct list_head        uuids;
+
+        struct list_head        link_keys;
+
         struct hci_dev_stats    stat;
 
         struct sk_buff_head     driver_init;
@@ -165,31 +199,37 @@ struct hci_dev {
 struct hci_conn {
         struct list_head list;
 
-        atomic_t         refcnt;
-        spinlock_t       lock;
-
-        bdaddr_t         dst;
-        __u16            handle;
-        __u16            state;
-        __u8             mode;
-        __u8             type;
-        __u8             out;
-        __u8             attempt;
-        __u8             dev_class[3];
-        __u8             features[8];
-        __u8             ssp_mode;
-        __u16            interval;
-        __u16            pkt_type;
-        __u16            link_policy;
-        __u32            link_mode;
-        __u8             auth_type;
-        __u8             sec_level;
-        __u8             pending_sec_level;
-        __u8             power_save;
-        __u16            disc_timeout;
-        unsigned long    pend;
-
-        unsigned int     sent;
+        atomic_t        refcnt;
+        spinlock_t      lock;
+
+        bdaddr_t        dst;
+        __u16           handle;
+        __u16           state;
+        __u8            mode;
+        __u8            type;
+        __u8            out;
+        __u8            attempt;
+        __u8            dev_class[3];
+        __u8            features[8];
+        __u8            ssp_mode;
+        __u16           interval;
+        __u16           pkt_type;
+        __u16           link_policy;
+        __u32           link_mode;
+        __u8            auth_type;
+        __u8            sec_level;
+        __u8            pending_sec_level;
+        __u8            pin_length;
+        __u8            io_capability;
+        __u8            power_save;
+        __u16           disc_timeout;
+        unsigned long   pend;
+
+        __u8            remote_cap;
+        __u8            remote_oob;
+        __u8            remote_auth;
+
+        unsigned int    sent;
 
         struct sk_buff_head data_q;
 
@@ -208,6 +248,10 @@ struct hci_conn {
         void            *priv;
 
         struct hci_conn *link;
+
+        void (*connect_cfm_cb)  (struct hci_conn *conn, u8 status);
+        void (*security_cfm_cb) (struct hci_conn *conn, u8 status);
+        void (*disconn_cfm_cb)  (struct hci_conn *conn, u8 reason);
 };
 
 extern struct hci_proto *hci_proto[];
@@ -274,24 +318,40 @@ static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         list_add(&c->list, &h->list);
-        if (c->type == ACL_LINK)
+        switch (c->type) {
+        case ACL_LINK:
                 h->acl_num++;
-        else
+                break;
+        case LE_LINK:
+                h->le_num++;
+                break;
+        case SCO_LINK:
+        case ESCO_LINK:
                 h->sco_num++;
+                break;
+        }
 }
 
 static inline void hci_conn_hash_del(struct hci_dev *hdev, struct hci_conn *c)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         list_del(&c->list);
-        if (c->type == ACL_LINK)
+        switch (c->type) {
+        case ACL_LINK:
                 h->acl_num--;
-        else
+                break;
+        case LE_LINK:
+                h->le_num--;
+                break;
+        case SCO_LINK:
+        case ESCO_LINK:
                 h->sco_num--;
+                break;
+        }
 }
 
 static inline struct hci_conn *hci_conn_hash_lookup_handle(struct hci_dev *hdev,
-                                        __u16 handle)
+                                                                __u16 handle)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         struct list_head *p;
@@ -306,7 +366,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_handle(struct hci_dev *hdev,
 }
 
 static inline struct hci_conn *hci_conn_hash_lookup_ba(struct hci_dev *hdev,
-                                        __u8 type, bdaddr_t *ba)
+                                                        __u8 type, bdaddr_t *ba)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         struct list_head *p;
@@ -321,7 +381,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_ba(struct hci_dev *hdev,
 }
 
 static inline struct hci_conn *hci_conn_hash_lookup_state(struct hci_dev *hdev,
-                                        __u8 type, __u16 state)
+                                                        __u8 type, __u16 state)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
         struct list_head *p;
@@ -437,6 +497,16 @@ int hci_inquiry(void __user *arg);
 struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr);
 int hci_blacklist_clear(struct hci_dev *hdev);
 
+int hci_uuids_clear(struct hci_dev *hdev);
+
+int hci_link_keys_clear(struct hci_dev *hdev);
+struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
+int hci_add_link_key(struct hci_dev *hdev, int new_key, bdaddr_t *bdaddr,
+                                                u8 *key, u8 type, u8 pin_len);
+int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
+
+void hci_del_off_timer(struct hci_dev *hdev);
+
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
 
 int hci_recv_frame(struct sk_buff *skb);
@@ -458,6 +528,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 #define lmp_sniffsubr_capable(dev) ((dev)->features[5] & LMP_SNIFF_SUBR)
 #define lmp_esco_capable(dev)      ((dev)->features[3] & LMP_ESCO)
 #define lmp_ssp_capable(dev)       ((dev)->features[6] & LMP_SIMPLE_PAIR)
+#define lmp_no_flush_capable(dev)  ((dev)->features[6] & LMP_NO_FLUSH)
+#define lmp_le_capable(dev)        ((dev)->features[4] & LMP_LE)
 
 /* ----- HCI protocols ----- */
 struct hci_proto {
@@ -503,6 +575,9 @@ static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status)
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->connect_cfm)
                 hp->connect_cfm(conn, status);
+
+        if (conn->connect_cfm_cb)
+                conn->connect_cfm_cb(conn, status);
 }
 
 static inline int hci_proto_disconn_ind(struct hci_conn *conn)
@@ -532,6 +607,9 @@ static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason)
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->disconn_cfm)
                 hp->disconn_cfm(conn, reason);
+
+        if (conn->disconn_cfm_cb)
+                conn->disconn_cfm_cb(conn, reason);
 }
 
 static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
@@ -551,6 +629,9 @@ static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->security_cfm)
                 hp->security_cfm(conn, status, encrypt);
+
+        if (conn->security_cfm_cb)
+                conn->security_cfm_cb(conn, status);
 }
 
 static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u8 encrypt)
@@ -564,6 +645,9 @@ static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u
         hp = hci_proto[HCI_PROTO_SCO];
         if (hp && hp->security_cfm)
                 hp->security_cfm(conn, status, encrypt);
+
+        if (conn->security_cfm_cb)
+                conn->security_cfm_cb(conn, status);
 }
 
 int hci_register_proto(struct hci_proto *hproto);
@@ -660,12 +744,29 @@ void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode);
 void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data);
 
 /* ----- HCI Sockets ----- */
-void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb);
+void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb,
+                                                        struct sock *skip_sk);
 
 /* Management interface */
 int mgmt_control(struct sock *sk, struct msghdr *msg, size_t len);
 int mgmt_index_added(u16 index);
 int mgmt_index_removed(u16 index);
+int mgmt_powered(u16 index, u8 powered);
+int mgmt_discoverable(u16 index, u8 discoverable);
+int mgmt_connectable(u16 index, u8 connectable);
+int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type);
+int mgmt_connected(u16 index, bdaddr_t *bdaddr);
+int mgmt_disconnected(u16 index, bdaddr_t *bdaddr);
+int mgmt_disconnect_failed(u16 index);
+int mgmt_connect_failed(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_pin_code_request(u16 index, bdaddr_t *bdaddr);
+int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_pin_code_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value);
+int mgmt_user_confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_user_confirm_neg_reply_complete(u16 index, bdaddr_t *bdaddr,
+                                                                u8 status);
+int mgmt_auth_failed(u16 index, bdaddr_t *bdaddr, u8 status);
 
 /* HCI info for socket */
 #define hci_pi(sk) ((struct hci_pinfo *) sk)
@@ -697,4 +798,6 @@ struct hci_sec_filter {
 
 void hci_req_complete(struct hci_dev *hdev, __u16 cmd, int result);
 
+void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
+                                        u16 latency, u16 to_multiplier);
 #endif /* __HCI_CORE_H */
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 7ad25ca60ec0..4f4bff1eaed6 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -38,6 +38,7 @@
 #define L2CAP_DEFAULT_MAX_PDU_SIZE      1009    /* Sized for 3-DH5 packet */
 #define L2CAP_DEFAULT_ACK_TO            200
 #define L2CAP_LOCAL_BUSY_TRIES          12
+#define L2CAP_LE_DEFAULT_MTU            23
 
 #define L2CAP_CONN_TIMEOUT      (40000) /* 40 seconds */
 #define L2CAP_INFO_TIMEOUT      (4000)  /*  4 seconds */
@@ -88,6 +89,8 @@ struct l2cap_conninfo {
 #define L2CAP_ECHO_RSP          0x09
 #define L2CAP_INFO_REQ          0x0a
 #define L2CAP_INFO_RSP          0x0b
+#define L2CAP_CONN_PARAM_UPDATE_REQ     0x12
+#define L2CAP_CONN_PARAM_UPDATE_RSP     0x13
 
 /* L2CAP feature mask */
 #define L2CAP_FEAT_FLOWCTL      0x00000001
@@ -160,6 +163,9 @@ struct l2cap_conn_rsp {
 /* channel indentifier */
 #define L2CAP_CID_SIGNALING     0x0001
 #define L2CAP_CID_CONN_LESS     0x0002
+#define L2CAP_CID_LE_DATA       0x0004
+#define L2CAP_CID_LE_SIGNALING  0x0005
+#define L2CAP_CID_SMP           0x0006
 #define L2CAP_CID_DYN_START     0x0040
 #define L2CAP_CID_DYN_END       0xffff
 
@@ -255,6 +261,21 @@ struct l2cap_info_rsp {
 #define L2CAP_IR_SUCCESS    0x0000
 #define L2CAP_IR_NOTSUPP    0x0001
 
+struct l2cap_conn_param_update_req {
+        __le16      min;
+        __le16      max;
+        __le16      latency;
+        __le16      to_multiplier;
+} __packed;
+
+struct l2cap_conn_param_update_rsp {
+        __le16      result;
+} __packed;
+
+/* Connection Parameters result */
+#define L2CAP_CONN_PARAM_ACCEPTED       0x0000
+#define L2CAP_CONN_PARAM_REJECTED       0x0001
+
 /* ----- L2CAP connections ----- */
 struct l2cap_chan_list {
         struct sock     *head;
@@ -327,6 +348,7 @@ struct l2cap_pinfo {
         __u8            sec_level;
         __u8            role_switch;
         __u8            force_reliable;
+        __u8            flushable;
 
         __u8            conf_req[64];
         __u8            conf_len;
@@ -423,6 +445,35 @@ static inline int l2cap_tx_window_full(struct sock *sk)
 #define __is_sframe(ctrl)       ((ctrl) & L2CAP_CTRL_FRAME_TYPE)
 #define __is_sar_start(ctrl)    (((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START)
 
-void l2cap_load(void);
+extern int disable_ertm;
+extern const struct proto_ops l2cap_sock_ops;
+extern struct bt_sock_list l2cap_sk_list;
+
+int l2cap_init_sockets(void);
+void l2cap_cleanup_sockets(void);
+
+u8 l2cap_get_ident(struct l2cap_conn *conn);
+void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len, void *data);
+int l2cap_build_conf_req(struct sock *sk, void *data);
+int __l2cap_wait_ack(struct sock *sk);
+
+struct sk_buff *l2cap_create_connless_pdu(struct sock *sk, struct msghdr *msg, size_t len);
+struct sk_buff *l2cap_create_basic_pdu(struct sock *sk, struct msghdr *msg, size_t len);
+struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *msg, size_t len, u16 control, u16 sdulen);
+int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, size_t len);
+void l2cap_do_send(struct sock *sk, struct sk_buff *skb);
+void l2cap_streaming_send(struct sock *sk);
+int l2cap_ertm_send(struct sock *sk);
+
+void l2cap_sock_set_timer(struct sock *sk, long timeout);
+void l2cap_sock_clear_timer(struct sock *sk);
+void __l2cap_sock_close(struct sock *sk, int reason);
+void l2cap_sock_kill(struct sock *sk);
+void l2cap_sock_init(struct sock *sk, struct sock *parent);
+struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
+                                                        int proto, gfp_t prio);
+void l2cap_send_disconn_req(struct l2cap_conn *conn, struct sock *sk, int err);
+void l2cap_chan_del(struct sock *sk, int err);
+int l2cap_do_connect(struct sock *sk);
 
 #endif /* __L2CAP_H */
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index ca29c1367ffd..5fabfa886b3e 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -21,11 +21,13 @@
    SOFTWARE IS DISCLAIMED.
 */
 
+#define MGMT_INDEX_NONE                 0xFFFF
+
 struct mgmt_hdr {
         __le16 opcode;
+        __le16 index;
         __le16 len;
 } __packed;
-#define MGMT_HDR_SIZE                   4
 
 #define MGMT_OP_READ_VERSION            0x0001
 struct mgmt_rp_read_version {
@@ -40,13 +42,10 @@ struct mgmt_rp_read_index_list {
 } __packed;
 
 #define MGMT_OP_READ_INFO               0x0004
-struct mgmt_cp_read_info {
-        __le16 index;
-} __packed;
 struct mgmt_rp_read_info {
-        __le16 index;
         __u8 type;
         __u8 powered;
+        __u8 connectable;
         __u8 discoverable;
         __u8 pairable;
         __u8 sec_mode;
@@ -58,6 +57,116 @@ struct mgmt_rp_read_info {
         __u16 hci_rev;
 } __packed;
 
+struct mgmt_mode {
+        __u8 val;
+} __packed;
+
+#define MGMT_OP_SET_POWERED             0x0005
+
+#define MGMT_OP_SET_DISCOVERABLE        0x0006
+
+#define MGMT_OP_SET_CONNECTABLE         0x0007
+
+#define MGMT_OP_SET_PAIRABLE            0x0008
+
+#define MGMT_OP_ADD_UUID                0x0009
+struct mgmt_cp_add_uuid {
+        __u8 uuid[16];
+        __u8 svc_hint;
+} __packed;
+
+#define MGMT_OP_REMOVE_UUID             0x000A
+struct mgmt_cp_remove_uuid {
+        __u8 uuid[16];
+} __packed;
+
+#define MGMT_OP_SET_DEV_CLASS           0x000B
+struct mgmt_cp_set_dev_class {
+        __u8 major;
+        __u8 minor;
+} __packed;
+
+#define MGMT_OP_SET_SERVICE_CACHE       0x000C
+struct mgmt_cp_set_service_cache {
+        __u8 enable;
+} __packed;
+
+struct mgmt_key_info {
+        bdaddr_t bdaddr;
+        u8 type;
+        u8 val[16];
+        u8 pin_len;
+} __packed;
+
+#define MGMT_OP_LOAD_KEYS               0x000D
+struct mgmt_cp_load_keys {
+        __u8 debug_keys;
+        __le16 key_count;
+        struct mgmt_key_info keys[0];
+} __packed;
+
+#define MGMT_OP_REMOVE_KEY              0x000E
+struct mgmt_cp_remove_key {
+        bdaddr_t bdaddr;
+        __u8 disconnect;
+} __packed;
+
+#define MGMT_OP_DISCONNECT              0x000F
+struct mgmt_cp_disconnect {
+        bdaddr_t bdaddr;
+} __packed;
+struct mgmt_rp_disconnect {
+        bdaddr_t bdaddr;
+} __packed;
+
+#define MGMT_OP_GET_CONNECTIONS         0x0010
+struct mgmt_rp_get_connections {
+        __le16 conn_count;
+        bdaddr_t conn[0];
+} __packed;
+
+#define MGMT_OP_PIN_CODE_REPLY          0x0011
+struct mgmt_cp_pin_code_reply {
+        bdaddr_t bdaddr;
+        __u8 pin_len;
+        __u8 pin_code[16];
+} __packed;
+struct mgmt_rp_pin_code_reply {
+        bdaddr_t bdaddr;
+        uint8_t status;
+} __packed;
+
+#define MGMT_OP_PIN_CODE_NEG_REPLY      0x0012
+struct mgmt_cp_pin_code_neg_reply {
+        bdaddr_t bdaddr;
+} __packed;
+
+#define MGMT_OP_SET_IO_CAPABILITY       0x0013
+struct mgmt_cp_set_io_capability {
+        __u8 io_capability;
+} __packed;
+
+#define MGMT_OP_PAIR_DEVICE             0x0014
+struct mgmt_cp_pair_device {
+        bdaddr_t bdaddr;
+        __u8 io_cap;
+} __packed;
+struct mgmt_rp_pair_device {
+        bdaddr_t bdaddr;
+        __u8 status;
+} __packed;
+
+#define MGMT_OP_USER_CONFIRM_REPLY      0x0015
+struct mgmt_cp_user_confirm_reply {
+        bdaddr_t bdaddr;
+} __packed;
+struct mgmt_rp_user_confirm_reply {
+        bdaddr_t bdaddr;
+        __u8 status;
+} __packed;
+
+#define MGMT_OP_USER_CONFIRM_NEG_REPLY  0x0016
+
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
         __le16 opcode;
@@ -72,16 +181,56 @@ struct mgmt_ev_cmd_status {
 
 #define MGMT_EV_CONTROLLER_ERROR        0x0003
 struct mgmt_ev_controller_error {
-        __le16 index;
         __u8 error_code;
 } __packed;
 
 #define MGMT_EV_INDEX_ADDED             0x0004
-struct mgmt_ev_index_added {
-        __le16 index;
-} __packed;
 
 #define MGMT_EV_INDEX_REMOVED           0x0005
-struct mgmt_ev_index_removed {
-        __le16 index;
+
+#define MGMT_EV_POWERED                 0x0006
+
+#define MGMT_EV_DISCOVERABLE            0x0007
+
+#define MGMT_EV_CONNECTABLE             0x0008
+
+#define MGMT_EV_PAIRABLE                0x0009
+
+#define MGMT_EV_NEW_KEY                 0x000A
+struct mgmt_ev_new_key {
+        struct mgmt_key_info key;
+        __u8 old_key_type;
+} __packed;
+
+#define MGMT_EV_CONNECTED               0x000B
+struct mgmt_ev_connected {
+        bdaddr_t bdaddr;
+} __packed;
+
+#define MGMT_EV_DISCONNECTED            0x000C
+struct mgmt_ev_disconnected {
+        bdaddr_t bdaddr;
+} __packed;
+
+#define MGMT_EV_CONNECT_FAILED          0x000D
+struct mgmt_ev_connect_failed {
+        bdaddr_t bdaddr;
+        __u8 status;
+} __packed;
+
+#define MGMT_EV_PIN_CODE_REQUEST        0x000E
+struct mgmt_ev_pin_code_request {
+        bdaddr_t bdaddr;
+} __packed;
+
+#define MGMT_EV_USER_CONFIRM_REQUEST    0x000F
+struct mgmt_ev_user_confirm_request {
+        bdaddr_t bdaddr;
+        __le32 value;
+} __packed;
+
+#define MGMT_EV_AUTH_FAILED             0x0010
+struct mgmt_ev_auth_failed {
+        bdaddr_t bdaddr;
+        __u8 status;
 } __packed;
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h
new file mode 100644
index 000000000000..8f2edbf979dc
--- /dev/null
+++ b/include/net/bluetooth/smp.h
@@ -0,0 +1,76 @@
+#ifndef __SMP_H
+#define __SMP_H
+
+struct smp_command_hdr {
+        __u8    code;
+} __packed;
+
+#define SMP_CMD_PAIRING_REQ     0x01
+#define SMP_CMD_PAIRING_RSP     0x02
+struct smp_cmd_pairing {
+        __u8    io_capability;
+        __u8    oob_flag;
+        __u8    auth_req;
+        __u8    max_key_size;
+        __u8    init_key_dist;
+        __u8    resp_key_dist;
+} __packed;
+
+#define SMP_CMD_PAIRING_CONFIRM 0x03
+struct smp_cmd_pairing_confirm {
+        __u8    confirm_val[16];
+} __packed;
+
+#define SMP_CMD_PAIRING_RANDOM  0x04
+struct smp_cmd_pairing_random {
+        __u8    rand_val[16];
+} __packed;
+
+#define SMP_CMD_PAIRING_FAIL    0x05
+struct smp_cmd_pairing_fail {
+        __u8    reason;
+} __packed;
+
+#define SMP_CMD_ENCRYPT_INFO    0x06
+struct smp_cmd_encrypt_info {
+        __u8    ltk[16];
+} __packed;
+
+#define SMP_CMD_MASTER_IDENT    0x07
+struct smp_cmd_master_ident {
+        __u16   ediv;
+        __u8    rand[8];
+} __packed;
+
+#define SMP_CMD_IDENT_INFO      0x08
+struct smp_cmd_ident_info {
+        __u8    irk[16];
+} __packed;
+
+#define SMP_CMD_IDENT_ADDR_INFO 0x09
+struct smp_cmd_ident_addr_info {
+        __u8    addr_type;
+        bdaddr_t bdaddr;
+} __packed;
+
+#define SMP_CMD_SIGN_INFO       0x0a
+struct smp_cmd_sign_info {
+        __u8    csrk[16];
+} __packed;
+
+#define SMP_CMD_SECURITY_REQ    0x0b
+struct smp_cmd_security_req {
+        __u8    auth_req;
+} __packed;
+
+#define SMP_PASSKEY_ENTRY_FAILED        0x01
+#define SMP_OOB_NOT_AVAIL               0x02
+#define SMP_AUTH_REQUIREMENTS           0x03
+#define SMP_CONFIRM_FAILED              0x04
+#define SMP_PAIRING_NOTSUPP             0x05
+#define SMP_ENC_KEY_SIZE                0x06
+#define SMP_CMD_NOTSUPP         0x07
+#define SMP_UNSPECIFIED         0x08
+#define SMP_REPEATED_ATTEMPTS           0x09
+
+#endif /* __SMP_H */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 1322695beb52..60f7876b6da8 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -413,7 +413,7 @@ struct station_parameters {
  * @STATION_INFO_PLID: @plid filled
  * @STATION_INFO_PLINK_STATE: @plink_state filled
  * @STATION_INFO_SIGNAL: @signal filled
- * @STATION_INFO_TX_BITRATE: @tx_bitrate fields are filled
+ * @STATION_INFO_TX_BITRATE: @txrate fields are filled
  *  (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs)
  * @STATION_INFO_RX_PACKETS: @rx_packets filled
  * @STATION_INFO_TX_PACKETS: @tx_packets filled
@@ -421,6 +421,7 @@ struct station_parameters {
  * @STATION_INFO_TX_FAILED: @tx_failed filled
  * @STATION_INFO_RX_DROP_MISC: @rx_dropped_misc filled
  * @STATION_INFO_SIGNAL_AVG: @signal_avg filled
+ * @STATION_INFO_RX_BITRATE: @rxrate fields are filled
  */
 enum station_info_flags {
         STATION_INFO_INACTIVE_TIME      = 1<<0,
@@ -437,6 +438,7 @@ enum station_info_flags {
         STATION_INFO_TX_FAILED          = 1<<11,
         STATION_INFO_RX_DROP_MISC       = 1<<12,
         STATION_INFO_SIGNAL_AVG         = 1<<13,
+        STATION_INFO_RX_BITRATE         = 1<<14,
 };
 
 /**
@@ -506,6 +508,7 @@ struct station_info {
         s8 signal;
         s8 signal_avg;
         struct rate_info txrate;
+        struct rate_info rxrate;
         u32 rx_packets;
         u32 tx_packets;
         u32 tx_retries;
@@ -1194,6 +1197,10 @@ struct cfg80211_pmksa {
  *      (also see nl80211.h @NL80211_ATTR_WIPHY_ANTENNA_TX).
  *
  * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant).
+ *
+ * @set_ringparam: Set tx and rx ring sizes.
+ *
+ * @get_ringparam: Get tx and rx ring current and maximum sizes.
  */
 struct cfg80211_ops {
         int     (*suspend)(struct wiphy *wiphy);
@@ -1361,6 +1368,10 @@ struct cfg80211_ops {
 
         int     (*set_antenna)(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant);
         int     (*get_antenna)(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant);
+
+        int     (*set_ringparam)(struct wiphy *wiphy, u32 tx, u32 rx);
+        void    (*get_ringparam)(struct wiphy *wiphy,
+                                 u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max);
 };
 
 /*
@@ -1790,8 +1801,9 @@ static inline void *wdev_priv(struct wireless_dev *wdev)
 /**
  * ieee80211_channel_to_frequency - convert channel number to frequency
  * @chan: channel number
+ * @band: band, necessary due to channel number overlap
  */
-extern int ieee80211_channel_to_frequency(int chan);
+extern int ieee80211_channel_to_frequency(int chan, enum ieee80211_band band);
 
 /**
  * ieee80211_frequency_to_channel - convert frequency to channel number
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
index a8e7852b10ab..e5983c9053dc 100644
--- a/include/net/dcbnl.h
+++ b/include/net/dcbnl.h
@@ -43,6 +43,8 @@ struct dcbnl_rtnl_ops {
         int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *);
         int (*ieee_getapp) (struct net_device *, struct dcb_app *);
         int (*ieee_setapp) (struct net_device *, struct dcb_app *);
+        int (*ieee_peer_getets) (struct net_device *, struct ieee_ets *);
+        int (*ieee_peer_getpfc) (struct net_device *, struct ieee_pfc *);
 
         /* CEE std */
         u8   (*getstate)(struct net_device *);
@@ -77,7 +79,14 @@ struct dcbnl_rtnl_ops {
         u8   (*getdcbx)(struct net_device *);
         u8   (*setdcbx)(struct net_device *, u8);
 
+        /* peer apps */
+        int (*peer_getappinfo)(struct net_device *, struct dcb_peer_app_info *,
+                               u16 *);
+        int (*peer_getapptable)(struct net_device *, struct dcb_app *);
 
+        /* CEE peer */
+        int (*cee_peer_getpg) (struct net_device *, struct cee_pg *);
+        int (*cee_peer_getpfc) (struct net_device *, struct cee_pfc *);
 };
 
 #endif /* __NET_DCBNL_H__ */
diff --git a/include/net/dn.h b/include/net/dn.h
index a514a3cf4573..298521e0d8a2 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -192,10 +192,10 @@ static inline void dn_dn2eth(unsigned char *ethaddr, __le16 addr)
         ethaddr[5] = (__u8)(a >> 8);
 }
 
-static inline void dn_sk_ports_copy(struct flowi *fl, struct dn_scp *scp)
+static inline void dn_sk_ports_copy(struct flowidn *fld, struct dn_scp *scp)
 {
-        fl->uli_u.dnports.sport = scp->addrloc;
-        fl->uli_u.dnports.dport = scp->addrrem;
+        fld->fld_sport = scp->addrloc;
+        fld->fld_dport = scp->addrrem;
 }
 
 extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index bbcde3238e58..782ef7cb4930 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -98,7 +98,7 @@ struct dn_fib_table {
         int (*delete)(struct dn_fib_table *t, struct rtmsg *r,
                         struct dn_kern_rta *rta, struct nlmsghdr *n,
                         struct netlink_skb_parms *req);
-        int (*lookup)(struct dn_fib_table *t, const struct flowi *fl,
+        int (*lookup)(struct dn_fib_table *t, const struct flowidn *fld,
                         struct dn_fib_res *res);
         int (*flush)(struct dn_fib_table *t);
         int (*dump)(struct dn_fib_table *t, struct sk_buff *skb, struct netlink_callback *cb);
@@ -119,12 +119,12 @@ extern struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r,
                                 struct dn_kern_rta *rta, 
                                 const struct nlmsghdr *nlh, int *errp);
 extern int dn_fib_semantic_match(int type, struct dn_fib_info *fi, 
-                        const struct flowi *fl,
+                        const struct flowidn *fld,
                         struct dn_fib_res *res);
 extern void dn_fib_release_info(struct dn_fib_info *fi);
 extern __le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
 extern void dn_fib_flush(void);
-extern void dn_fib_select_multipath(const struct flowi *fl,
+extern void dn_fib_select_multipath(const struct flowidn *fld,
                                         struct dn_fib_res *res);
 
 /*
@@ -141,7 +141,7 @@ extern void dn_fib_table_cleanup(void);
 extern void dn_fib_rules_init(void);
 extern void dn_fib_rules_cleanup(void);
 extern unsigned dnet_addr_type(__le16 addr);
-extern int dn_fib_lookup(struct flowi *fl, struct dn_fib_res *res);
+extern int dn_fib_lookup(struct flowidn *fld, struct dn_fib_res *res);
 
 extern int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb);
 
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 9b185df265fb..81712cfa1ddf 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -16,7 +16,7 @@
 *******************************************************************************/
 
 extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri);
-extern int dn_route_output_sock(struct dst_entry **pprt, struct flowi *, struct sock *sk, int flags);
+extern int dn_route_output_sock(struct dst_entry **pprt, struct flowidn *, struct sock *sk, int flags);
 extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
 extern void dn_rt_cache_flush(int delay);
 
@@ -67,7 +67,7 @@ extern void dn_rt_cache_flush(int delay);
 struct dn_route {
         struct dst_entry dst;
 
-        struct flowi fl;
+        struct flowidn fld;
 
         __le16 rt_saddr;
         __le16 rt_daddr;
@@ -82,12 +82,12 @@ struct dn_route {
 
 static inline bool dn_is_input_route(struct dn_route *rt)
 {
-        return rt->fl.iif != 0;
+        return rt->fld.flowidn_iif != 0;
 }
 
 static inline bool dn_is_output_route(struct dn_route *rt)
 {
-        return rt->fl.iif == 0;
+        return rt->fld.flowidn_iif == 0;
 }
 
 extern void dn_route_init(void);
diff --git a/include/net/dst.h b/include/net/dst.h
index 93b0310317be..2a46cbaef92d 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -40,24 +40,10 @@ struct dst_entry {
         struct rcu_head         rcu_head;
         struct dst_entry        *child;
         struct net_device       *dev;
-        short                   error;
-        short                   obsolete;
-        int                     flags;
-#define DST_HOST                0x0001
-#define DST_NOXFRM              0x0002
-#define DST_NOPOLICY            0x0004
-#define DST_NOHASH              0x0008
-#define DST_NOCACHE             0x0010
+        struct  dst_ops         *ops;
+        unsigned long           _metrics;
         unsigned long           expires;
-
-        unsigned short          header_len;     /* more space at head required */
-        unsigned short          trailer_len;    /* space to reserve at tail */
-
-        unsigned int            rate_tokens;
-        unsigned long           rate_last;      /* rate limiting for ICMP */
-
         struct dst_entry        *path;
-
         struct neighbour        *neighbour;
         struct hh_cache         *hh;
 #ifdef CONFIG_XFRM
@@ -68,17 +54,16 @@ struct dst_entry {
         int                     (*input)(struct sk_buff*);
         int                     (*output)(struct sk_buff*);
 
-        struct  dst_ops         *ops;
-
-        u32                     _metrics[RTAX_MAX];
-
-#ifdef CONFIG_NET_CLS_ROUTE
+        short                   error;
+        short                   obsolete;
+        unsigned short          header_len;     /* more space at head required */
+        unsigned short          trailer_len;    /* space to reserve at tail */
+#ifdef CONFIG_IP_ROUTE_CLASSID
         __u32                   tclassid;
 #else
         __u32                   __pad2;
 #endif
 
-
         /*
          * Align __refcnt to a 64 bytes alignment
          * (L1_CACHE_SIZE would be too much)
@@ -93,6 +78,12 @@ struct dst_entry {
         atomic_t                __refcnt;       /* client references    */
         int                     __use;
         unsigned long           lastuse;
+        int                     flags;
+#define DST_HOST                0x0001
+#define DST_NOXFRM              0x0002
+#define DST_NOPOLICY            0x0004
+#define DST_NOHASH              0x0008
+#define DST_NOCACHE             0x0010
         union {
                 struct dst_entry        *next;
                 struct rtable __rcu     *rt_next;
@@ -103,10 +94,70 @@ struct dst_entry {
 
 #ifdef __KERNEL__
 
+extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
+extern const u32 dst_default_metrics[RTAX_MAX];
+
+#define DST_METRICS_READ_ONLY   0x1UL
+#define __DST_METRICS_PTR(Y)    \
+        ((u32 *)((Y) & ~DST_METRICS_READ_ONLY))
+#define DST_METRICS_PTR(X)      __DST_METRICS_PTR((X)->_metrics)
+
+static inline bool dst_metrics_read_only(const struct dst_entry *dst)
+{
+        return dst->_metrics & DST_METRICS_READ_ONLY;
+}
+
+extern void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old);
+
+static inline void dst_destroy_metrics_generic(struct dst_entry *dst)
+{
+        unsigned long val = dst->_metrics;
+        if (!(val & DST_METRICS_READ_ONLY))
+                __dst_destroy_metrics_generic(dst, val);
+}
+
+static inline u32 *dst_metrics_write_ptr(struct dst_entry *dst)
+{
+        unsigned long p = dst->_metrics;
+
+        if (p & DST_METRICS_READ_ONLY)
+                return dst->ops->cow_metrics(dst, p);
+        return __DST_METRICS_PTR(p);
+}
+
+/* This may only be invoked before the entry has reached global
+ * visibility.
+ */
+static inline void dst_init_metrics(struct dst_entry *dst,
+                                    const u32 *src_metrics,
+                                    bool read_only)
+{
+        dst->_metrics = ((unsigned long) src_metrics) |
+                (read_only ? DST_METRICS_READ_ONLY : 0);
+}
+
+static inline void dst_copy_metrics(struct dst_entry *dest, const struct dst_entry *src)
+{
+        u32 *dst_metrics = dst_metrics_write_ptr(dest);
+
+        if (dst_metrics) {
+                u32 *src_metrics = DST_METRICS_PTR(src);
+
+                memcpy(dst_metrics, src_metrics, RTAX_MAX * sizeof(u32));
+        }
+}
+
+static inline u32 *dst_metrics_ptr(struct dst_entry *dst)
+{
+        return DST_METRICS_PTR(dst);
+}
+
 static inline u32
 dst_metric_raw(const struct dst_entry *dst, const int metric)
 {
-        return dst->_metrics[metric-1];
+        u32 *p = DST_METRICS_PTR(dst);
+
+        return p[metric-1];
 }
 
 static inline u32
@@ -131,22 +182,10 @@ dst_metric_advmss(const struct dst_entry *dst)
 
 static inline void dst_metric_set(struct dst_entry *dst, int metric, u32 val)
 {
-        dst->_metrics[metric-1] = val;
-}
+        u32 *p = dst_metrics_write_ptr(dst);
 
-static inline void dst_import_metrics(struct dst_entry *dst, const u32 *src_metrics)
-{
-        memcpy(dst->_metrics, src_metrics, RTAX_MAX * sizeof(u32));
-}
-
-static inline void dst_copy_metrics(struct dst_entry *dest, const struct dst_entry *src)
-{
-        dst_import_metrics(dest, src->_metrics);
-}
-
-static inline u32 *dst_metrics_ptr(struct dst_entry *dst)
-{
-        return dst->_metrics;
+        if (p)
+                p[metric-1] = val;
 }
 
 static inline u32
@@ -181,8 +220,6 @@ static inline u32
 dst_allfrag(const struct dst_entry *dst)
 {
         int ret = dst_feature(dst,  RTAX_FEATURE_ALLFRAG);
-        /* Yes, _exactly_. This is paranoia. */
-        barrier();
         return ret;
 }
 
@@ -315,7 +352,7 @@ static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)
 }
 
 extern int dst_discard(struct sk_buff *skb);
-extern void * dst_alloc(struct dst_ops * ops);
+extern void *dst_alloc(struct dst_ops * ops, int initial_ref);
 extern void __dst_free(struct dst_entry * dst);
 extern struct dst_entry *dst_destroy(struct dst_entry * dst);
 
@@ -384,27 +421,22 @@ extern void		dst_init(void);
 
 /* Flags for xfrm_lookup flags argument. */
 enum {
-        XFRM_LOOKUP_WAIT = 1 << 0,
-        XFRM_LOOKUP_ICMP = 1 << 1,
+        XFRM_LOOKUP_ICMP = 1 << 0,
 };
 
 struct flowi;
 #ifndef CONFIG_XFRM
-static inline int xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                              struct flowi *fl, struct sock *sk, int flags)
+static inline struct dst_entry *xfrm_lookup(struct net *net,
+                                            struct dst_entry *dst_orig,
+                                            const struct flowi *fl, struct sock *sk,
+                                            int flags)
 {
-        return 0;
+        return dst_orig;
 } 
-static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                                struct flowi *fl, struct sock *sk, int flags)
-{
-        return 0;
-}
 #else
-extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                       struct flowi *fl, struct sock *sk, int flags);
-extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                         struct flowi *fl, struct sock *sk, int flags);
+extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
+                                     const struct flowi *fl, struct sock *sk,
+                                     int flags);
 #endif
 #endif
 
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index 21a320b8708e..dc0746328947 100644
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -18,6 +18,7 @@ struct dst_ops {
         struct dst_entry *      (*check)(struct dst_entry *, __u32 cookie);
         unsigned int            (*default_advmss)(const struct dst_entry *);
         unsigned int            (*default_mtu)(const struct dst_entry *);
+        u32 *                   (*cow_metrics)(struct dst_entry *, unsigned long);
         void                    (*destroy)(struct dst_entry *);
         void                    (*ifdown)(struct dst_entry *,
                                           struct net_device *dev, int how);
diff --git a/include/net/flow.h b/include/net/flow.h
index 240b7f356c71..7fe5a0f9483a 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -10,78 +10,136 @@
 #include <linux/in6.h>
 #include <asm/atomic.h>
 
-struct flowi {
-        int     oif;
-        int     iif;
-        __u32   mark;
+struct flowi_common {
+        int     flowic_oif;
+        int     flowic_iif;
+        __u32   flowic_mark;
+        __u8    flowic_tos;
+        __u8    flowic_scope;
+        __u8    flowic_proto;
+        __u8    flowic_flags;
+#define FLOWI_FLAG_ANYSRC               0x01
+#define FLOWI_FLAG_PRECOW_METRICS       0x02
+#define FLOWI_FLAG_CAN_SLEEP            0x04
+        __u32   flowic_secid;
+};
 
+union flowi_uli {
+        struct {
+                __be16  sport;
+                __be16  dport;
+        } ports;
+
+        struct {
+                __u8    type;
+                __u8    code;
+        } icmpt;
+
+        struct {
+                __le16  sport;
+                __le16  dport;
+        } dnports;
+
+        __be32          spi;
+        __be32          gre_key;
+
+        struct {
+                __u8    type;
+        } mht;
+};
+
+struct flowi4 {
+        struct flowi_common     __fl_common;
+#define flowi4_oif              __fl_common.flowic_oif
+#define flowi4_iif              __fl_common.flowic_iif
+#define flowi4_mark             __fl_common.flowic_mark
+#define flowi4_tos              __fl_common.flowic_tos
+#define flowi4_scope            __fl_common.flowic_scope
+#define flowi4_proto            __fl_common.flowic_proto
+#define flowi4_flags            __fl_common.flowic_flags
+#define flowi4_secid            __fl_common.flowic_secid
+        __be32                  daddr;
+        __be32                  saddr;
+        union flowi_uli         uli;
+#define fl4_sport               uli.ports.sport
+#define fl4_dport               uli.ports.dport
+#define fl4_icmp_type           uli.icmpt.type
+#define fl4_icmp_code           uli.icmpt.code
+#define fl4_ipsec_spi           uli.spi
+#define fl4_mh_type             uli.mht.type
+#define fl4_gre_key             uli.gre_key
+};
+
+struct flowi6 {
+        struct flowi_common     __fl_common;
+#define flowi6_oif              __fl_common.flowic_oif
+#define flowi6_iif              __fl_common.flowic_iif
+#define flowi6_mark             __fl_common.flowic_mark
+#define flowi6_tos              __fl_common.flowic_tos
+#define flowi6_scope            __fl_common.flowic_scope
+#define flowi6_proto            __fl_common.flowic_proto
+#define flowi6_flags            __fl_common.flowic_flags
+#define flowi6_secid            __fl_common.flowic_secid
+        struct in6_addr         daddr;
+        struct in6_addr         saddr;
+        __be32                  flowlabel;
+        union flowi_uli         uli;
+#define fl6_sport               uli.ports.sport
+#define fl6_dport               uli.ports.dport
+#define fl6_icmp_type           uli.icmpt.type
+#define fl6_icmp_code           uli.icmpt.code
+#define fl6_ipsec_spi           uli.spi
+#define fl6_mh_type             uli.mht.type
+#define fl6_gre_key             uli.gre_key
+};
+
+struct flowidn {
+        struct flowi_common     __fl_common;
+#define flowidn_oif             __fl_common.flowic_oif
+#define flowidn_iif             __fl_common.flowic_iif
+#define flowidn_mark            __fl_common.flowic_mark
+#define flowidn_scope           __fl_common.flowic_scope
+#define flowidn_proto           __fl_common.flowic_proto
+#define flowidn_flags           __fl_common.flowic_flags
+        __le16                  daddr;
+        __le16                  saddr;
+        union flowi_uli         uli;
+#define fld_sport               uli.ports.sport
+#define fld_dport               uli.ports.dport
+};
+
+struct flowi {
         union {
-                struct {
-                        __be32                  daddr;
-                        __be32                  saddr;
-                        __u8                    tos;
-                        __u8                    scope;
-                } ip4_u;
-                
-                struct {
-                        struct in6_addr         daddr;
-                        struct in6_addr         saddr;
-                        __be32                  flowlabel;
-                } ip6_u;
-
-                struct {
-                        __le16                  daddr;
-                        __le16                  saddr;
-                        __u8                    scope;
-                } dn_u;
-        } nl_u;
-#define fld_dst         nl_u.dn_u.daddr
-#define fld_src         nl_u.dn_u.saddr
-#define fld_scope       nl_u.dn_u.scope
-#define fl6_dst         nl_u.ip6_u.daddr
-#define fl6_src         nl_u.ip6_u.saddr
-#define fl6_flowlabel   nl_u.ip6_u.flowlabel
-#define fl4_dst         nl_u.ip4_u.daddr
-#define fl4_src         nl_u.ip4_u.saddr
-#define fl4_tos         nl_u.ip4_u.tos
-#define fl4_scope       nl_u.ip4_u.scope
-
-        __u8    proto;
-        __u8    flags;
-#define FLOWI_FLAG_ANYSRC 0x01
-        union {
-                struct {
-                        __be16  sport;
-                        __be16  dport;
-                } ports;
-
-                struct {
-                        __u8    type;
-                        __u8    code;
-                } icmpt;
-
-                struct {
-                        __le16  sport;
-                        __le16  dport;
-                } dnports;
-
-                __be32          spi;
-                __be32          gre_key;
-
-                struct {
-                        __u8    type;
-                } mht;
-        } uli_u;
-#define fl_ip_sport     uli_u.ports.sport
-#define fl_ip_dport     uli_u.ports.dport
-#define fl_icmp_type    uli_u.icmpt.type
-#define fl_icmp_code    uli_u.icmpt.code
-#define fl_ipsec_spi    uli_u.spi
-#define fl_mh_type      uli_u.mht.type
-#define fl_gre_key      uli_u.gre_key
-        __u32           secid;  /* used by xfrm; see secid.txt */
+                struct flowi_common     __fl_common;
+                struct flowi4           ip4;
+                struct flowi6           ip6;
+                struct flowidn          dn;
+        } u;
+#define flowi_oif       u.__fl_common.flowic_oif
+#define flowi_iif       u.__fl_common.flowic_iif
+#define flowi_mark      u.__fl_common.flowic_mark
+#define flowi_tos       u.__fl_common.flowic_tos
+#define flowi_scope     u.__fl_common.flowic_scope
+#define flowi_proto     u.__fl_common.flowic_proto
+#define flowi_flags     u.__fl_common.flowic_flags
+#define flowi_secid     u.__fl_common.flowic_secid
 } __attribute__((__aligned__(BITS_PER_LONG/8)));
 
+static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)
+{
+        return container_of(fl4, struct flowi, u.ip4);
+}
+
+static inline struct flowi *flowi6_to_flowi(struct flowi6 *fl6)
+{
+        return container_of(fl6, struct flowi, u.ip6);
+}
+
+static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
+{
+        return container_of(fldn, struct flowi, u.dn);
+}
+
 #define FLOW_DIR_IN     0
 #define FLOW_DIR_OUT    1
 #define FLOW_DIR_FWD    2
@@ -101,20 +159,14 @@ struct flow_cache_ops {
 };
 
 typedef struct flow_cache_object *(*flow_resolve_t)(
-                struct net *net, struct flowi *key, u16 family,
+                struct net *net, const struct flowi *key, u16 family,
                 u8 dir, struct flow_cache_object *oldobj, void *ctx);
 
 extern struct flow_cache_object *flow_cache_lookup(
-                struct net *net, struct flowi *key, u16 family,
+                struct net *net, const struct flowi *key, u16 family,
                 u8 dir, flow_resolve_t resolver, void *ctx);
 
 extern void flow_cache_flush(void);
 extern atomic_t flow_cache_genid;
 
-static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
-{
-        return (fl1->proto == fl2->proto &&
-                !memcmp(&fl1->uli_u, &fl2->uli_u, sizeof(fl1->uli_u)));
-}
-
 #endif
diff --git a/include/net/icmp.h b/include/net/icmp.h
index 6e991e0d0d6f..f0698b955b73 100644
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -45,7 +45,4 @@ extern int	icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int      icmp_init(void);
 extern void     icmp_out_count(struct net *net, unsigned char type);
 
-/* Move into dst.h ? */
-extern int      xrlim_allow(struct dst_entry *dst, int timeout);
-
 #endif  /* _ICMP_H */
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index af49f8ab7f81..b0be5fb9de19 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -178,6 +178,11 @@ struct ieee80211_radiotap_header {
  *
  *     Number of unicast retries a transmitted frame used.
  *
+ * IEEE80211_RADIOTAP_MCS       u8, u8, u8              unitless
+ *
+ *     Contains a bitmap of known fields/flags, the flags, and
+ *     the MCS index.
+ *
  */
 enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_TSFT = 0,
@@ -199,6 +204,8 @@ enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_RTS_RETRIES = 16,
         IEEE80211_RADIOTAP_DATA_RETRIES = 17,
 
+        IEEE80211_RADIOTAP_MCS = 19,
+
         /* valid in every it_present bitmap, even vendor namespaces */
         IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
         IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
@@ -245,6 +252,24 @@ enum ieee80211_radiotap_type {
 #define IEEE80211_RADIOTAP_F_TX_CTS     0x0002  /* used cts 'protection' */
 #define IEEE80211_RADIOTAP_F_TX_RTS     0x0004  /* used rts/cts handshake */
 
+
+/* For IEEE80211_RADIOTAP_MCS */
+#define IEEE80211_RADIOTAP_MCS_HAVE_BW          0x01
+#define IEEE80211_RADIOTAP_MCS_HAVE_MCS         0x02
+#define IEEE80211_RADIOTAP_MCS_HAVE_GI          0x04
+#define IEEE80211_RADIOTAP_MCS_HAVE_FMT         0x08
+#define IEEE80211_RADIOTAP_MCS_HAVE_FEC         0x10
+
+#define IEEE80211_RADIOTAP_MCS_BW_MASK          0x03
+#define         IEEE80211_RADIOTAP_MCS_BW_20    0
+#define         IEEE80211_RADIOTAP_MCS_BW_40    1
+#define         IEEE80211_RADIOTAP_MCS_BW_20L   2
+#define         IEEE80211_RADIOTAP_MCS_BW_20U   3
+#define IEEE80211_RADIOTAP_MCS_SGI              0x04
+#define IEEE80211_RADIOTAP_MCS_FMT_GF           0x08
+#define IEEE80211_RADIOTAP_MCS_FEC_LDPC         0x10
+
+
 /* Ugly macro to convert literal channel numbers into their mhz equivalents
  * There are certianly some conditions that will break this (like feeding it '30')
  * but they shouldn't arise since nothing talks on channel 30. */
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 8181498fa96c..7a37369f8ea3 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -86,6 +86,19 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
         return (struct inet_request_sock *)sk;
 }
 
+struct inet_cork {
+        unsigned int            flags;
+        unsigned int            fragsize;
+        struct ip_options       *opt;
+        struct dst_entry        *dst;
+        int                     length; /* Total length of all frames */
+        __be32                  addr;
+        struct flowi            fl;
+        struct page             *page;
+        u32                     off;
+        u8                      tx_flags;
+};
+
 struct ip_mc_socklist;
 struct ipv6_pinfo;
 struct rtable;
@@ -143,15 +156,7 @@ struct inet_sock {
         int                     mc_index;
         __be32                  mc_addr;
         struct ip_mc_socklist __rcu     *mc_list;
-        struct {
-                unsigned int            flags;
-                unsigned int            fragsize;
-                struct ip_options       *opt;
-                struct dst_entry        *dst;
-                int                     length; /* Total length of all frames */
-                __be32                  addr;
-                struct flowi            fl;
-        } cork;
+        struct inet_cork        cork;
 };
 
 #define IPCORK_OPT      1       /* ip-options has been held in ipcork.opt */
@@ -219,7 +224,13 @@ static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops
 
 static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
 {
-        return inet_sk(sk)->transparent ? FLOWI_FLAG_ANYSRC : 0;
+        __u8 flags = 0;
+
+        if (inet_sk(sk)->transparent)
+                flags |= FLOWI_FLAG_ANYSRC;
+        if (sk->sk_protocol == IPPROTO_TCP)
+                flags |= FLOWI_FLAG_PRECOW_METRICS;
+        return flags;
 }
 
 #endif  /* _INET_SOCK_H */
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 599d96e74114..e6dd8da6b2ad 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -11,15 +11,20 @@
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <linux/spinlock.h>
+#include <linux/rtnetlink.h>
 #include <net/ipv6.h>
 #include <asm/atomic.h>
 
-struct inetpeer_addr {
+struct inetpeer_addr_base {
         union {
-                __be32          a4;
-                __be32          a6[4];
+                __be32                  a4;
+                __be32                  a6[4];
         };
-        __u16   family;
+};
+
+struct inetpeer_addr {
+        struct inetpeer_addr_base       addr;
+        __u16                           family;
 };
 
 struct inet_peer {
@@ -33,15 +38,22 @@ struct inet_peer {
         atomic_t                refcnt;
         /*
          * Once inet_peer is queued for deletion (refcnt == -1), following fields
-         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
-         * We can share memory with rcu_head to keep inet_peer small
+         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp, metrics
+         * We can share memory with rcu_head to help keep inet_peer small.
          */
         union {
                 struct {
-                        atomic_t        rid;            /* Frag reception counter */
-                        atomic_t        ip_id_count;    /* IP ID for the next packet */
-                        __u32           tcp_ts;
-                        __u32           tcp_ts_stamp;
+                        atomic_t                        rid;            /* Frag reception counter */
+                        atomic_t                        ip_id_count;    /* IP ID for the next packet */
+                        __u32                           tcp_ts;
+                        __u32                           tcp_ts_stamp;
+                        u32                             metrics[RTAX_MAX];
+                        u32                             rate_tokens;    /* rate limiting for ICMP */
+                        unsigned long                   rate_last;
+                        unsigned long                   pmtu_expires;
+                        u32                             pmtu_orig;
+                        u32                             pmtu_learned;
+                        struct inetpeer_addr_base       redirect_learned;
                 };
                 struct rcu_head         rcu;
         };
@@ -49,6 +61,13 @@ struct inet_peer {
 
 void                    inet_initpeers(void) __init;
 
+#define INETPEER_METRICS_NEW    (~(u32) 0)
+
+static inline bool inet_metrics_new(const struct inet_peer *p)
+{
+        return p->metrics[RTAX_LOCK-1] == INETPEER_METRICS_NEW;
+}
+
 /* can be called with or without local BH being disabled */
 struct inet_peer        *inet_getpeer(struct inetpeer_addr *daddr, int create);
 
@@ -56,7 +75,7 @@ static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create)
 {
         struct inetpeer_addr daddr;
 
-        daddr.a4 = v4daddr;
+        daddr.addr.a4 = v4daddr;
         daddr.family = AF_INET;
         return inet_getpeer(&daddr, create);
 }
@@ -65,13 +84,14 @@ static inline struct inet_peer *inet_getpeer_v6(struct in6_addr *v6daddr, int cr
 {
         struct inetpeer_addr daddr;
 
-        ipv6_addr_copy((struct in6_addr *)daddr.a6, v6daddr);
+        ipv6_addr_copy((struct in6_addr *)daddr.addr.a6, v6daddr);
         daddr.family = AF_INET6;
         return inet_getpeer(&daddr, create);
 }
 
 /* can be called from BH context or outside */
 extern void inet_putpeer(struct inet_peer *p);
+extern bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);
 
 /*
  * temporary check to make sure we dont access rid, ip_id_count, tcp_ts,
diff --git a/include/net/ip.h b/include/net/ip.h
index 67fac78a186b..a4f631108c54 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -116,8 +116,24 @@ extern int		ip_append_data(struct sock *sk,
 extern int              ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb);
 extern ssize_t          ip_append_page(struct sock *sk, struct page *page,
                                 int offset, size_t size, int flags);
+extern struct sk_buff  *__ip_make_skb(struct sock *sk,
+                                      struct sk_buff_head *queue,
+                                      struct inet_cork *cork);
+extern int              ip_send_skb(struct sk_buff *skb);
 extern int              ip_push_pending_frames(struct sock *sk);
 extern void             ip_flush_pending_frames(struct sock *sk);
+extern struct sk_buff  *ip_make_skb(struct sock *sk,
+                                    int getfrag(void *from, char *to, int offset, int len,
+                                                int odd, struct sk_buff *skb),
+                                    void *from, int length, int transhdrlen,
+                                    struct ipcm_cookie *ipc,
+                                    struct rtable **rtp,
+                                    unsigned int flags);
+
+static inline struct sk_buff *ip_finish_skb(struct sock *sk)
+{
+        return __ip_make_skb(sk, &sk->sk_write_queue, &inet_sk(sk)->cork);
+}
 
 /* datagram.c */
 extern int              ip4_datagram_connect(struct sock *sk, 
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 708ff7cb8806..bc3cde0a810c 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -108,6 +108,7 @@ struct rt6_info {
         u32                             rt6i_flags;
         struct rt6key                   rt6i_src;
         u32                             rt6i_metric;
+        u32                             rt6i_peer_genid;
 
         struct inet6_dev                *rt6i_idev;
         struct inet_peer                *rt6i_peer;
@@ -182,7 +183,7 @@ struct fib6_table {
 
 typedef struct rt6_info *(*pol_lookup_t)(struct net *,
                                          struct fib6_table *,
-                                         struct flowi *, int);
+                                         struct flowi6 *, int);
 
 /*
  *      exported functions
@@ -191,7 +192,7 @@ typedef struct rt6_info *(*pol_lookup_t)(struct net *,
 extern struct fib6_table        *fib6_get_table(struct net *net, u32 id);
 extern struct fib6_table        *fib6_new_table(struct net *net, u32 id);
 extern struct dst_entry         *fib6_rule_lookup(struct net *net,
-                                                  struct flowi *fl, int flags,
+                                                  struct flowi6 *fl6, int flags,
                                                   pol_lookup_t lookup);
 
 extern struct fib6_node         *fib6_lookup(struct fib6_node *root,
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 8552f0a2e854..642a80bb42cf 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -71,7 +71,7 @@ extern void			ip6_route_input(struct sk_buff *skb);
 
 extern struct dst_entry *       ip6_route_output(struct net *net,
                                                  struct sock *sk,
-                                                 struct flowi *fl);
+                                                 struct flowi6 *fl6);
 
 extern int                      ip6_route_init(void);
 extern void                     ip6_route_cleanup(void);
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 07bdb5e9e8ac..a1a858035913 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -51,15 +51,17 @@ struct fib_nh {
         struct fib_info         *nh_parent;
         unsigned                nh_flags;
         unsigned char           nh_scope;
+        unsigned char           nh_cfg_scope;
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
         int                     nh_weight;
         int                     nh_power;
 #endif
-#ifdef CONFIG_NET_CLS_ROUTE
+#ifdef CONFIG_IP_ROUTE_CLASSID
         __u32                   nh_tclassid;
 #endif
         int                     nh_oif;
         __be32                  nh_gw;
+        __be32                  nh_saddr;
 };
 
 /*
@@ -77,7 +79,7 @@ struct fib_info {
         int                     fib_protocol;
         __be32                  fib_prefsrc;
         u32                     fib_priority;
-        u32                     fib_metrics[RTAX_MAX];
+        u32                     *fib_metrics;
 #define fib_mtu fib_metrics[RTAX_MTU-1]
 #define fib_window fib_metrics[RTAX_WINDOW-1]
 #define fib_rtt fib_metrics[RTAX_RTT-1]
@@ -96,12 +98,15 @@ struct fib_info {
 struct fib_rule;
 #endif
 
+struct fib_table;
 struct fib_result {
         unsigned char   prefixlen;
         unsigned char   nh_sel;
         unsigned char   type;
         unsigned char   scope;
         struct fib_info *fi;
+        struct fib_table *table;
+        struct list_head *fa_head;
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         struct fib_rule *r;
 #endif
@@ -136,11 +141,13 @@ struct fib_result_nl {
 
 #endif /* CONFIG_IP_ROUTE_MULTIPATH */
 
-#define FIB_RES_PREFSRC(res)            ((res).fi->fib_prefsrc ? : __fib_res_prefsrc(&res))
+#define FIB_RES_SADDR(res)              (FIB_RES_NH(res).nh_saddr)
 #define FIB_RES_GW(res)                 (FIB_RES_NH(res).nh_gw)
 #define FIB_RES_DEV(res)                (FIB_RES_NH(res).nh_dev)
 #define FIB_RES_OIF(res)                (FIB_RES_NH(res).nh_oif)
 
+#define FIB_RES_PREFSRC(res)            ((res).fi->fib_prefsrc ? : FIB_RES_SADDR(res))
+
 struct fib_table {
         struct hlist_node tb_hlist;
         u32             tb_id;
@@ -148,16 +155,13 @@ struct fib_table {
         unsigned char   tb_data[0];
 };
 
-extern int fib_table_lookup(struct fib_table *tb, const struct flowi *flp,
+extern int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
                             struct fib_result *res, int fib_flags);
 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);
 extern void fib_free_table(struct fib_table *tb);
 
 
@@ -182,7 +186,7 @@ static inline struct fib_table *fib_new_table(struct net *net, u32 id)
         return fib_get_table(net, id);
 }
 
-static inline int fib_lookup(struct net *net, const struct flowi *flp,
+static inline int fib_lookup(struct net *net, const struct flowi4 *flp,
                              struct fib_result *res)
 {
         struct fib_table *table;
@@ -201,11 +205,11 @@ static inline int fib_lookup(struct net *net, const struct flowi *flp,
 extern int __net_init fib4_rules_init(struct net *net);
 extern void __net_exit fib4_rules_exit(struct net *net);
 
-#ifdef CONFIG_NET_CLS_ROUTE
-extern u32 fib_rules_tclass(struct fib_result *res);
+#ifdef CONFIG_IP_ROUTE_CLASSID
+extern u32 fib_rules_tclass(const struct fib_result *res);
 #endif
 
-extern int fib_lookup(struct net *n, struct flowi *flp, struct fib_result *res);
+extern int fib_lookup(struct net *n, struct flowi4 *flp, struct fib_result *res);
 
 extern struct fib_table *fib_new_table(struct net *net, u32 id);
 extern struct fib_table *fib_get_table(struct net *net, u32 id);
@@ -218,24 +222,23 @@ extern void		ip_fib_init(void);
 extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
                                struct net_device *dev, __be32 *spec_dst,
                                u32 *itag, u32 mark);
-extern void fib_select_default(struct net *net, const struct flowi *flp,
-                               struct fib_result *res);
+extern void fib_select_default(struct fib_result *res);
 
 /* Exported by fib_semantics.c */
 extern int ip_fib_check_default(__be32 gw, struct net_device *dev);
 extern int fib_sync_down_dev(struct net_device *dev, int force);
 extern int fib_sync_down_addr(struct net *net, __be32 local);
+extern void fib_update_nh_saddrs(struct net_device *dev);
 extern int fib_sync_up(struct net_device *dev);
-extern __be32  __fib_res_prefsrc(struct fib_result *res);
-extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res);
+extern void fib_select_multipath(struct fib_result *res);
 
-/* Exported by fib_{hash|trie}.c */
-extern void fib_hash_init(void);
-extern struct fib_table *fib_hash_table(u32 id);
+/* Exported by fib_trie.c */
+extern void fib_trie_init(void);
+extern struct fib_table *fib_trie_table(u32 id);
 
-static inline void fib_combine_itag(u32 *itag, struct fib_result *res)
+static inline void fib_combine_itag(u32 *itag, const struct fib_result *res)
 {
-#ifdef CONFIG_NET_CLS_ROUTE
+#ifdef CONFIG_IP_ROUTE_CLASSID
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         u32 rtag;
 #endif
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index b7bbd6c28cfa..272f59336b73 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -28,6 +28,80 @@
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 #include <net/netfilter/nf_conntrack.h>
 #endif
+#include <net/net_namespace.h>          /* Netw namespace */
+
+/*
+ * Generic access of ipvs struct
+ */
+static inline struct netns_ipvs *net_ipvs(struct net* net)
+{
+        return net->ipvs;
+}
+/*
+ * Get net ptr from skb in traffic cases
+ * use skb_sknet when call is from userland (ioctl or netlink)
+ */
+static inline struct net *skb_net(const struct sk_buff *skb)
+{
+#ifdef CONFIG_NET_NS
+#ifdef CONFIG_IP_VS_DEBUG
+        /*
+         * This is used for debug only.
+         * Start with the most likely hit
+         * End with BUG
+         */
+        if (likely(skb->dev && skb->dev->nd_net))
+                return dev_net(skb->dev);
+        if (skb_dst(skb)->dev)
+                return dev_net(skb_dst(skb)->dev);
+        WARN(skb->sk, "Maybe skb_sknet should be used in %s() at line:%d\n",
+                      __func__, __LINE__);
+        if (likely(skb->sk && skb->sk->sk_net))
+                return sock_net(skb->sk);
+        pr_err("There is no net ptr to find in the skb in %s() line:%d\n",
+                __func__, __LINE__);
+        BUG();
+#else
+        return dev_net(skb->dev ? : skb_dst(skb)->dev);
+#endif
+#else
+        return &init_net;
+#endif
+}
+
+static inline struct net *skb_sknet(const struct sk_buff *skb)
+{
+#ifdef CONFIG_NET_NS
+#ifdef CONFIG_IP_VS_DEBUG
+        /* Start with the most likely hit */
+        if (likely(skb->sk && skb->sk->sk_net))
+                return sock_net(skb->sk);
+        WARN(skb->dev, "Maybe skb_net should be used instead in %s() line:%d\n",
+                       __func__, __LINE__);
+        if (likely(skb->dev && skb->dev->nd_net))
+                return dev_net(skb->dev);
+        pr_err("There is no net ptr to find in the skb in %s() line:%d\n",
+                __func__, __LINE__);
+        BUG();
+#else
+        return sock_net(skb->sk);
+#endif
+#else
+        return &init_net;
+#endif
+}
+/*
+ * This one needed for single_open_net since net is stored directly in
+ * private not as a struct i.e. seq_file_net cant be used.
+ */
+static inline struct net *seq_file_single_net(struct seq_file *seq)
+{
+#ifdef CONFIG_NET_NS
+        return (struct net *)seq->private;
+#else
+        return &init_net;
+#endif
+}
 
 /* Connections' size value needed by ip_vs_ctl.c */
 extern int ip_vs_conn_tab_size;
@@ -258,6 +332,23 @@ struct ip_vs_seq {
                                                    before last resized pkt */
 };
 
+/*
+ * counters per cpu
+ */
+struct ip_vs_counters {
+        __u32           conns;          /* connections scheduled */
+        __u32           inpkts;         /* incoming packets */
+        __u32           outpkts;        /* outgoing packets */
+        __u64           inbytes;        /* incoming bytes */
+        __u64           outbytes;       /* outgoing bytes */
+};
+/*
+ * Stats per cpu
+ */
+struct ip_vs_cpu_stats {
+        struct ip_vs_counters   ustats;
+        struct u64_stats_sync   syncp;
+};
 
 /*
  *      IPVS statistics objects
@@ -279,10 +370,11 @@ struct ip_vs_estimator {
 };
 
 struct ip_vs_stats {
-        struct ip_vs_stats_user ustats;         /* statistics */
+        struct ip_vs_stats_user ustats;         /* statistics */
         struct ip_vs_estimator  est;            /* estimator */
-
-        spinlock_t              lock;           /* spin lock */
+        struct ip_vs_cpu_stats  *cpustats;      /* per cpu counters */
+        spinlock_t              lock;           /* spin lock */
+        struct ip_vs_stats_user ustats0;        /* reset values */
 };
 
 struct dst_entry;
@@ -290,6 +382,7 @@ struct iphdr;
 struct ip_vs_conn;
 struct ip_vs_app;
 struct sk_buff;
+struct ip_vs_proto_data;
 
 struct ip_vs_protocol {
         struct ip_vs_protocol   *next;
@@ -297,21 +390,22 @@ struct ip_vs_protocol {
         u16                     protocol;
         u16                     num_states;
         int                     dont_defrag;
-        atomic_t                appcnt;         /* counter of proto app incs */
-        int                     *timeout_table; /* protocol timeout table */
 
         void (*init)(struct ip_vs_protocol *pp);
 
         void (*exit)(struct ip_vs_protocol *pp);
 
+        void (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);
+
+        void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);
+
         int (*conn_schedule)(int af, struct sk_buff *skb,
-                             struct ip_vs_protocol *pp,
+                             struct ip_vs_proto_data *pd,
                              int *verdict, struct ip_vs_conn **cpp);
 
         struct ip_vs_conn *
         (*conn_in_get)(int af,
                        const struct sk_buff *skb,
-                       struct ip_vs_protocol *pp,
                        const struct ip_vs_iphdr *iph,
                        unsigned int proto_off,
                        int inverse);
@@ -319,7 +413,6 @@ struct ip_vs_protocol {
         struct ip_vs_conn *
         (*conn_out_get)(int af,
                         const struct sk_buff *skb,
-                        struct ip_vs_protocol *pp,
                         const struct ip_vs_iphdr *iph,
                         unsigned int proto_off,
                         int inverse);
@@ -337,11 +430,11 @@ struct ip_vs_protocol {
 
         int (*state_transition)(struct ip_vs_conn *cp, int direction,
                                 const struct sk_buff *skb,
-                                struct ip_vs_protocol *pp);
+                                struct ip_vs_proto_data *pd);
 
-        int (*register_app)(struct ip_vs_app *inc);
+        int (*register_app)(struct net *net, struct ip_vs_app *inc);
 
-        void (*unregister_app)(struct ip_vs_app *inc);
+        void (*unregister_app)(struct net *net, struct ip_vs_app *inc);
 
         int (*app_conn_bind)(struct ip_vs_conn *cp);
 
@@ -350,14 +443,26 @@ struct ip_vs_protocol {
                              int offset,
                              const char *msg);
 
-        void (*timeout_change)(struct ip_vs_protocol *pp, int flags);
+        void (*timeout_change)(struct ip_vs_proto_data *pd, int flags);
+};
 
-        int (*set_state_timeout)(struct ip_vs_protocol *pp, char *sname, int to);
+/*
+ * protocol data per netns
+ */
+struct ip_vs_proto_data {
+        struct ip_vs_proto_data *next;
+        struct ip_vs_protocol   *pp;
+        int                     *timeout_table; /* protocol timeout table */
+        atomic_t                appcnt;         /* counter of proto app incs. */
+        struct tcp_states_t     *tcp_state_table;
 };
 
-extern struct ip_vs_protocol * ip_vs_proto_get(unsigned short proto);
+extern struct ip_vs_protocol   *ip_vs_proto_get(unsigned short proto);
+extern struct ip_vs_proto_data *ip_vs_proto_data_get(struct net *net,
+                                                     unsigned short proto);
 
 struct ip_vs_conn_param {
+        struct net                      *net;
         const union nf_inet_addr        *caddr;
         const union nf_inet_addr        *vaddr;
         __be16                          cport;
@@ -374,17 +479,20 @@ struct ip_vs_conn_param {
  *      IP_VS structure allocated for each dynamically scheduled connection
  */
 struct ip_vs_conn {
-        struct list_head        c_list;         /* hashed list heads */
-
+        struct hlist_node       c_list;         /* hashed list heads */
+#ifdef CONFIG_NET_NS
+        struct net              *net;           /* Name space */
+#endif
         /* Protocol, addresses and port numbers */
-        u16                      af;            /* address family */
-        union nf_inet_addr       caddr;          /* client address */
-        union nf_inet_addr       vaddr;          /* virtual address */
-        union nf_inet_addr       daddr;          /* destination address */
-        volatile __u32           flags;          /* status flags */
-        __be16                   cport;
-        __be16                   vport;
-        __be16                   dport;
+        u16                     af;             /* address family */
+        __be16                  cport;
+        __be16                  vport;
+        __be16                  dport;
+        __u32                   fwmark;         /* Fire wall mark from skb */
+        union nf_inet_addr      caddr;          /* client address */
+        union nf_inet_addr      vaddr;          /* virtual address */
+        union nf_inet_addr      daddr;          /* destination address */
+        volatile __u32          flags;          /* status flags */
         __u16                   protocol;       /* Which protocol (TCP/UDP) */
 
         /* counter and timer */
@@ -422,10 +530,38 @@ struct ip_vs_conn {
         struct ip_vs_seq        in_seq;         /* incoming seq. struct */
         struct ip_vs_seq        out_seq;        /* outgoing seq. struct */
 
+        const struct ip_vs_pe   *pe;
         char                    *pe_data;
         __u8                    pe_data_len;
 };
 
+/*
+ *  To save some memory in conn table when name space is disabled.
+ */
+static inline struct net *ip_vs_conn_net(const struct ip_vs_conn *cp)
+{
+#ifdef CONFIG_NET_NS
+        return cp->net;
+#else
+        return &init_net;
+#endif
+}
+static inline void ip_vs_conn_net_set(struct ip_vs_conn *cp, struct net *net)
+{
+#ifdef CONFIG_NET_NS
+        cp->net = net;
+#endif
+}
+
+static inline int ip_vs_conn_net_eq(const struct ip_vs_conn *cp,
+                                    struct net *net)
+{
+#ifdef CONFIG_NET_NS
+        return cp->net == net;
+#else
+        return 1;
+#endif
+}
 
 /*
  *      Extended internal versions of struct ip_vs_service_user and
@@ -485,6 +621,7 @@ struct ip_vs_service {
         unsigned                flags;    /* service status flags */
         unsigned                timeout;  /* persistent timeout in ticks */
         __be32                  netmask;  /* grouping granularity */
+        struct net              *net;
 
         struct list_head        destinations;  /* real server d-linked list */
         __u32                   num_dests;     /* number of servers */
@@ -510,8 +647,8 @@ struct ip_vs_dest {
         struct list_head        d_list;   /* for table with all the dests */
 
         u16                     af;             /* address family */
-        union nf_inet_addr      addr;           /* IP address of the server */
         __be16                  port;           /* port number of the server */
+        union nf_inet_addr      addr;           /* IP address of the server */
         volatile unsigned       flags;          /* dest status flags */
         atomic_t                conn_flags;     /* flags to copy to conn */
         atomic_t                weight;         /* server weight */
@@ -538,8 +675,8 @@ struct ip_vs_dest {
         /* for virtual service */
         struct ip_vs_service    *svc;           /* service it belongs to */
         __u16                   protocol;       /* which protocol (TCP/UDP) */
-        union nf_inet_addr      vaddr;          /* virtual IP address */
         __be16                  vport;          /* virtual port number */
+        union nf_inet_addr      vaddr;          /* virtual IP address */
         __u32                   vfwmark;        /* firewall mark of service */
 };
 
@@ -651,6 +788,171 @@ struct ip_vs_app {
         void (*timeout_change)(struct ip_vs_app *app, int flags);
 };
 
+/* IPVS in network namespace */
+struct netns_ipvs {
+        int                     gen;            /* Generation */
+        /*
+         *      Hash table: for real service lookups
+         */
+        #define IP_VS_RTAB_BITS 4
+        #define IP_VS_RTAB_SIZE (1 << IP_VS_RTAB_BITS)
+        #define IP_VS_RTAB_MASK (IP_VS_RTAB_SIZE - 1)
+
+        struct list_head        rs_table[IP_VS_RTAB_SIZE];
+        /* ip_vs_app */
+        struct list_head        app_list;
+        struct mutex            app_mutex;
+        struct lock_class_key   app_key;        /* mutex debuging */
+
+        /* ip_vs_proto */
+        #define IP_VS_PROTO_TAB_SIZE    32      /* must be power of 2 */
+        struct ip_vs_proto_data *proto_data_table[IP_VS_PROTO_TAB_SIZE];
+        /* ip_vs_proto_tcp */
+#ifdef CONFIG_IP_VS_PROTO_TCP
+        #define TCP_APP_TAB_BITS        4
+        #define TCP_APP_TAB_SIZE        (1 << TCP_APP_TAB_BITS)
+        #define TCP_APP_TAB_MASK        (TCP_APP_TAB_SIZE - 1)
+        struct list_head        tcp_apps[TCP_APP_TAB_SIZE];
+        spinlock_t              tcp_app_lock;
+#endif
+        /* ip_vs_proto_udp */
+#ifdef CONFIG_IP_VS_PROTO_UDP
+        #define UDP_APP_TAB_BITS        4
+        #define UDP_APP_TAB_SIZE        (1 << UDP_APP_TAB_BITS)
+        #define UDP_APP_TAB_MASK        (UDP_APP_TAB_SIZE - 1)
+        struct list_head        udp_apps[UDP_APP_TAB_SIZE];
+        spinlock_t              udp_app_lock;
+#endif
+        /* ip_vs_proto_sctp */
+#ifdef CONFIG_IP_VS_PROTO_SCTP
+        #define SCTP_APP_TAB_BITS       4
+        #define SCTP_APP_TAB_SIZE       (1 << SCTP_APP_TAB_BITS)
+        #define SCTP_APP_TAB_MASK       (SCTP_APP_TAB_SIZE - 1)
+        /* Hash table for SCTP application incarnations  */
+        struct list_head        sctp_apps[SCTP_APP_TAB_SIZE];
+        spinlock_t              sctp_app_lock;
+#endif
+        /* ip_vs_conn */
+        atomic_t                conn_count;      /*  connection counter */
+
+        /* ip_vs_ctl */
+        struct ip_vs_stats              tot_stats;  /* Statistics & est. */
+
+        int                     num_services;    /* no of virtual services */
+
+        rwlock_t                rs_lock;         /* real services table */
+        /* semaphore for IPVS sockopts. And, [gs]etsockopt may sleep. */
+        struct lock_class_key   ctl_key;        /* ctl_mutex debuging */
+        /* Trash for destinations */
+        struct list_head        dest_trash;
+        /* Service counters */
+        atomic_t                ftpsvc_counter;
+        atomic_t                nullsvc_counter;
+
+#ifdef CONFIG_SYSCTL
+        /* 1/rate drop and drop-entry variables */
+        struct delayed_work     defense_work;   /* Work handler */
+        int                     drop_rate;
+        int                     drop_counter;
+        atomic_t                dropentry;
+        /* locks in ctl.c */
+        spinlock_t              dropentry_lock;  /* drop entry handling */
+        spinlock_t              droppacket_lock; /* drop packet handling */
+        spinlock_t              securetcp_lock;  /* state and timeout tables */
+
+        /* sys-ctl struct */
+        struct ctl_table_header *sysctl_hdr;
+        struct ctl_table        *sysctl_tbl;
+#endif
+
+        /* sysctl variables */
+        int                     sysctl_amemthresh;
+        int                     sysctl_am_droprate;
+        int                     sysctl_drop_entry;
+        int                     sysctl_drop_packet;
+        int                     sysctl_secure_tcp;
+#ifdef CONFIG_IP_VS_NFCT
+        int                     sysctl_conntrack;
+#endif
+        int                     sysctl_snat_reroute;
+        int                     sysctl_sync_ver;
+        int                     sysctl_cache_bypass;
+        int                     sysctl_expire_nodest_conn;
+        int                     sysctl_expire_quiescent_template;
+        int                     sysctl_sync_threshold[2];
+        int                     sysctl_nat_icmp_send;
+
+        /* ip_vs_lblc */
+        int                     sysctl_lblc_expiration;
+        struct ctl_table_header *lblc_ctl_header;
+        struct ctl_table        *lblc_ctl_table;
+        /* ip_vs_lblcr */
+        int                     sysctl_lblcr_expiration;
+        struct ctl_table_header *lblcr_ctl_header;
+        struct ctl_table        *lblcr_ctl_table;
+        /* ip_vs_est */
+        struct list_head        est_list;       /* estimator list */
+        spinlock_t              est_lock;
+        struct timer_list       est_timer;      /* Estimation timer */
+        /* ip_vs_sync */
+        struct list_head        sync_queue;
+        spinlock_t              sync_lock;
+        struct ip_vs_sync_buff  *sync_buff;
+        spinlock_t              sync_buff_lock;
+        struct sockaddr_in      sync_mcast_addr;
+        struct task_struct      *master_thread;
+        struct task_struct      *backup_thread;
+        int                     send_mesg_maxlen;
+        int                     recv_mesg_maxlen;
+        volatile int            sync_state;
+        volatile int            master_syncid;
+        volatile int            backup_syncid;
+        /* multicast interface name */
+        char                    master_mcast_ifn[IP_VS_IFNAME_MAXLEN];
+        char                    backup_mcast_ifn[IP_VS_IFNAME_MAXLEN];
+        /* net name space ptr */
+        struct net              *net;            /* Needed by timer routines */
+};
+
+#define DEFAULT_SYNC_THRESHOLD  3
+#define DEFAULT_SYNC_PERIOD     50
+#define DEFAULT_SYNC_VER        1
+
+#ifdef CONFIG_SYSCTL
+
+static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_sync_threshold[0];
+}
+
+static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_sync_threshold[1];
+}
+
+static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
+{
+        return ipvs->sysctl_sync_ver;
+}
+
+#else
+
+static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
+{
+        return DEFAULT_SYNC_THRESHOLD;
+}
+
+static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
+{
+        return DEFAULT_SYNC_PERIOD;
+}
+
+static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
+{
+        return DEFAULT_SYNC_VER;
+}
+
+#endif
 
 /*
  *      IPVS core functions
@@ -674,13 +976,14 @@ enum {
         IP_VS_DIR_LAST,
 };
 
-static inline void ip_vs_conn_fill_param(int af, int protocol,
+static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol,
                                          const union nf_inet_addr *caddr,
                                          __be16 cport,
                                          const union nf_inet_addr *vaddr,
                                          __be16 vport,
                                          struct ip_vs_conn_param *p)
 {
+        p->net = net;
         p->af = af;
         p->protocol = protocol;
         p->caddr = caddr;
@@ -695,7 +998,6 @@ struct ip_vs_conn *ip_vs_conn_in_get(const struct ip_vs_conn_param *p);
 struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p);
 
 struct ip_vs_conn * ip_vs_conn_in_get_proto(int af, const struct sk_buff *skb,
-                                            struct ip_vs_protocol *pp,
                                             const struct ip_vs_iphdr *iph,
                                             unsigned int proto_off,
                                             int inverse);
@@ -703,7 +1005,6 @@ struct ip_vs_conn * ip_vs_conn_in_get_proto(int af, const struct sk_buff *skb,
 struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p);
 
 struct ip_vs_conn * ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb,
-                                             struct ip_vs_protocol *pp,
                                              const struct ip_vs_iphdr *iph,
                                              unsigned int proto_off,
                                              int inverse);
@@ -719,14 +1020,14 @@ extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __be16 cport);
 struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p,
                                   const union nf_inet_addr *daddr,
                                   __be16 dport, unsigned flags,
-                                  struct ip_vs_dest *dest);
+                                  struct ip_vs_dest *dest, __u32 fwmark);
 extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp);
 
 extern const char * ip_vs_state_name(__u16 proto, int state);
 
-extern void ip_vs_tcp_conn_listen(struct ip_vs_conn *cp);
+extern void ip_vs_tcp_conn_listen(struct net *net, struct ip_vs_conn *cp);
 extern int ip_vs_check_template(struct ip_vs_conn *ct);
-extern void ip_vs_random_dropentry(void);
+extern void ip_vs_random_dropentry(struct net *net);
 extern int ip_vs_conn_init(void);
 extern void ip_vs_conn_cleanup(void);
 
@@ -796,12 +1097,12 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)
  *      (from ip_vs_app.c)
  */
 #define IP_VS_APP_MAX_PORTS  8
-extern int register_ip_vs_app(struct ip_vs_app *app);
-extern void unregister_ip_vs_app(struct ip_vs_app *app);
+extern int register_ip_vs_app(struct net *net, struct ip_vs_app *app);
+extern void unregister_ip_vs_app(struct net *net, struct ip_vs_app *app);
 extern int ip_vs_bind_app(struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
 extern void ip_vs_unbind_app(struct ip_vs_conn *cp);
-extern int
-register_ip_vs_app_inc(struct ip_vs_app *app, __u16 proto, __u16 port);
+extern int register_ip_vs_app_inc(struct net *net, struct ip_vs_app *app,
+                                  __u16 proto, __u16 port);
 extern int ip_vs_app_inc_get(struct ip_vs_app *inc);
 extern void ip_vs_app_inc_put(struct ip_vs_app *inc);
 
@@ -814,15 +1115,27 @@ void ip_vs_bind_pe(struct ip_vs_service *svc, struct ip_vs_pe *pe);
 void ip_vs_unbind_pe(struct ip_vs_service *svc);
 int register_ip_vs_pe(struct ip_vs_pe *pe);
 int unregister_ip_vs_pe(struct ip_vs_pe *pe);
-extern struct ip_vs_pe *ip_vs_pe_get(const char *name);
-extern void ip_vs_pe_put(struct ip_vs_pe *pe);
+struct ip_vs_pe *ip_vs_pe_getbyname(const char *name);
+struct ip_vs_pe *__ip_vs_pe_getbyname(const char *pe_name);
+
+static inline void ip_vs_pe_get(const struct ip_vs_pe *pe)
+{
+        if (pe && pe->module)
+                __module_get(pe->module);
+}
+
+static inline void ip_vs_pe_put(const struct ip_vs_pe *pe)
+{
+        if (pe && pe->module)
+                module_put(pe->module);
+}
 
 /*
  *      IPVS protocol functions (from ip_vs_proto.c)
  */
 extern int ip_vs_protocol_init(void);
 extern void ip_vs_protocol_cleanup(void);
-extern void ip_vs_protocol_timeout_change(int flags);
+extern void ip_vs_protocol_timeout_change(struct netns_ipvs *ipvs, int flags);
 extern int *ip_vs_create_timeout_table(int *table, int size);
 extern int
 ip_vs_set_state_timeout(int *table, int num, const char *const *names,
@@ -852,26 +1165,23 @@ extern struct ip_vs_scheduler *ip_vs_scheduler_get(const char *sched_name);
 extern void ip_vs_scheduler_put(struct ip_vs_scheduler *scheduler);
 extern struct ip_vs_conn *
 ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb,
-               struct ip_vs_protocol *pp, int *ignored);
+               struct ip_vs_proto_data *pd, int *ignored);
 extern int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
-                        struct ip_vs_protocol *pp);
+                        struct ip_vs_proto_data *pd);
+
+extern void ip_vs_scheduler_err(struct ip_vs_service *svc, const char *msg);
 
 
 /*
  *      IPVS control data and functions (from ip_vs_ctl.c)
  */
-extern int sysctl_ip_vs_cache_bypass;
-extern int sysctl_ip_vs_expire_nodest_conn;
-extern int sysctl_ip_vs_expire_quiescent_template;
-extern int sysctl_ip_vs_sync_threshold[2];
-extern int sysctl_ip_vs_nat_icmp_send;
-extern int sysctl_ip_vs_conntrack;
-extern int sysctl_ip_vs_snat_reroute;
 extern struct ip_vs_stats ip_vs_stats;
 extern const struct ctl_path net_vs_ctl_path[];
+extern int sysctl_ip_vs_sync_ver;
 
+extern void ip_vs_sync_switch_mode(struct net *net, int mode);
 extern struct ip_vs_service *
-ip_vs_service_get(int af, __u32 fwmark, __u16 protocol,
+ip_vs_service_get(struct net *net, int af, __u32 fwmark, __u16 protocol,
                   const union nf_inet_addr *vaddr, __be16 vport);
 
 static inline void ip_vs_service_put(struct ip_vs_service *svc)
@@ -880,7 +1190,7 @@ static inline void ip_vs_service_put(struct ip_vs_service *svc)
 }
 
 extern struct ip_vs_dest *
-ip_vs_lookup_real_service(int af, __u16 protocol,
+ip_vs_lookup_real_service(struct net *net, int af, __u16 protocol,
                           const union nf_inet_addr *daddr, __be16 dport);
 
 extern int ip_vs_use_count_inc(void);
@@ -888,8 +1198,9 @@ extern void ip_vs_use_count_dec(void);
 extern int ip_vs_control_init(void);
 extern void ip_vs_control_cleanup(void);
 extern struct ip_vs_dest *
-ip_vs_find_dest(int af, const union nf_inet_addr *daddr, __be16 dport,
-                const union nf_inet_addr *vaddr, __be16 vport, __u16 protocol);
+ip_vs_find_dest(struct net *net, int af, const union nf_inet_addr *daddr,
+                __be16 dport, const union nf_inet_addr *vaddr, __be16 vport,
+                __u16 protocol, __u32 fwmark);
 extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp);
 
 
@@ -897,14 +1208,12 @@ extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp);
  *      IPVS sync daemon data and function prototypes
  *      (from ip_vs_sync.c)
  */
-extern volatile int ip_vs_sync_state;
-extern volatile int ip_vs_master_syncid;
-extern volatile int ip_vs_backup_syncid;
-extern char ip_vs_master_mcast_ifn[IP_VS_IFNAME_MAXLEN];
-extern char ip_vs_backup_mcast_ifn[IP_VS_IFNAME_MAXLEN];
-extern int start_sync_thread(int state, char *mcast_ifn, __u8 syncid);
-extern int stop_sync_thread(int state);
-extern void ip_vs_sync_conn(struct ip_vs_conn *cp);
+extern int start_sync_thread(struct net *net, int state, char *mcast_ifn,
+                             __u8 syncid);
+extern int stop_sync_thread(struct net *net, int state);
+extern void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp);
+extern int ip_vs_sync_init(void);
+extern void ip_vs_sync_cleanup(void);
 
 
 /*
@@ -912,9 +1221,11 @@ extern void ip_vs_sync_conn(struct ip_vs_conn *cp);
  */
 extern int ip_vs_estimator_init(void);
 extern void ip_vs_estimator_cleanup(void);
-extern void ip_vs_new_estimator(struct ip_vs_stats *stats);
-extern void ip_vs_kill_estimator(struct ip_vs_stats *stats);
+extern void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats);
+extern void ip_vs_stop_estimator(struct net *net, struct ip_vs_stats *stats);
 extern void ip_vs_zero_estimator(struct ip_vs_stats *stats);
+extern void ip_vs_read_estimator(struct ip_vs_stats_user *dst,
+                                 struct ip_vs_stats *stats);
 
 /*
  *      Various IPVS packet transmitters (from ip_vs_xmit.c)
@@ -947,21 +1258,25 @@ extern int ip_vs_icmp_xmit_v6
  int offset);
 #endif
 
+#ifdef CONFIG_SYSCTL
 /*
  *      This is a simple mechanism to ignore packets when
  *      we are loaded. Just set ip_vs_drop_rate to 'n' and
  *      we start to drop 1/rate of the packets
  */
-extern int ip_vs_drop_rate;
-extern int ip_vs_drop_counter;
 
-static __inline__ int ip_vs_todrop(void)
+static inline int ip_vs_todrop(struct netns_ipvs *ipvs)
 {
-        if (!ip_vs_drop_rate) return 0;
-        if (--ip_vs_drop_counter > 0) return 0;
-        ip_vs_drop_counter = ip_vs_drop_rate;
+        if (!ipvs->drop_rate)
+                return 0;
+        if (--ipvs->drop_counter > 0)
+                return 0;
+        ipvs->drop_counter = ipvs->drop_rate;
         return 1;
 }
+#else
+static inline int ip_vs_todrop(struct netns_ipvs *ipvs) { return 0; }
+#endif
 
 /*
  *      ip_vs_fwd_tag returns the forwarding tag of the connection
@@ -1031,7 +1346,7 @@ static inline void ip_vs_notrack(struct sk_buff *skb)
 {
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
         enum ip_conntrack_info ctinfo;
-        struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
+        struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
 
         if (!ct || !nf_ct_is_untracked(ct)) {
                 nf_reset(skb);
@@ -1047,9 +1362,13 @@ static inline void ip_vs_notrack(struct sk_buff *skb)
  *      Netfilter connection tracking
  *      (from ip_vs_nfct.c)
  */
-static inline int ip_vs_conntrack_enabled(void)
+static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs)
 {
-        return sysctl_ip_vs_conntrack;
+#ifdef CONFIG_SYSCTL
+        return ipvs->sysctl_conntrack;
+#else
+        return 0;
+#endif
 }
 
 extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp,
@@ -1062,7 +1381,7 @@ extern void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp);
 
 #else
 
-static inline int ip_vs_conntrack_enabled(void)
+static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs)
 {
         return 0;
 }
@@ -1084,6 +1403,20 @@ static inline void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp)
 /* CONFIG_IP_VS_NFCT */
 #endif
 
+static inline unsigned int
+ip_vs_dest_conn_overhead(struct ip_vs_dest *dest)
+{
+        /*
+         * We think the overhead of processing active connections is 256
+         * times higher than that of inactive connections in average. (This
+         * 256 times might not be accurate, we will change it later) We
+         * use the following formula to estimate the overhead now:
+         *                dest->activeconns*256 + dest->inactconns
+         */
+        return (atomic_read(&dest->activeconns) << 8) +
+                atomic_read(&dest->inactconns);
+}
+
 #endif /* __KERNEL__ */
 
 #endif  /* _NET_IP_VS_H */
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 96e50e0ce3ca..34200f9e6805 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -492,7 +492,7 @@ extern int			ip6_rcv_finish(struct sk_buff *skb);
  */
 extern int                      ip6_xmit(struct sock *sk,
                                          struct sk_buff *skb,
-                                         struct flowi *fl,
+                                         struct flowi6 *fl6,
                                          struct ipv6_txoptions *opt);
 
 extern int                      ip6_nd_hdr(struct sock *sk,
@@ -512,7 +512,7 @@ extern int			ip6_append_data(struct sock *sk,
                                                 int hlimit,
                                                 int tclass,
                                                 struct ipv6_txoptions *opt,
-                                                struct flowi *fl,
+                                                struct flowi6 *fl6,
                                                 struct rt6_info *rt,
                                                 unsigned int flags,
                                                 int dontfrag);
@@ -523,13 +523,17 @@ extern void			ip6_flush_pending_frames(struct sock *sk);
 
 extern int                      ip6_dst_lookup(struct sock *sk,
                                                struct dst_entry **dst,
-                                               struct flowi *fl);
-extern int                      ip6_dst_blackhole(struct sock *sk,
-                                                  struct dst_entry **dst,
-                                                  struct flowi *fl);
-extern int                      ip6_sk_dst_lookup(struct sock *sk,
-                                                  struct dst_entry **dst,
-                                                  struct flowi *fl);
+                                               struct flowi6 *fl6);
+extern struct dst_entry *       ip6_dst_lookup_flow(struct sock *sk,
+                                                    struct flowi6 *fl6,
+                                                    const struct in6_addr *final_dst,
+                                                    bool can_sleep);
+extern struct dst_entry *       ip6_sk_dst_lookup_flow(struct sock *sk,
+                                                       struct flowi6 *fl6,
+                                                       const struct in6_addr *final_dst,
+                                                       bool can_sleep);
+extern struct dst_entry *       ip6_blackhole_route(struct net *net,
+                                                    struct dst_entry *orig_dst);
 
 /*
  *      skb processing functions
@@ -562,7 +566,7 @@ extern int 			ipv6_ext_hdr(u8 nexthdr);
 
 extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);
 
-extern struct in6_addr *fl6_update_dst(struct flowi *fl,
+extern struct in6_addr *fl6_update_dst(struct flowi6 *fl6,
                                        const struct ipv6_txoptions *opt,
                                        struct in6_addr *orig);
 
@@ -596,8 +600,8 @@ extern int 			ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len);
 extern int                      ipv6_recv_rxpmtu(struct sock *sk, struct msghdr *msg, int len);
 extern void                     ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err, __be16 port,
                                                 u32 info, u8 *payload);
-extern void                     ipv6_local_error(struct sock *sk, int err, struct flowi *fl, u32 info);
-extern void                     ipv6_local_rxpmtu(struct sock *sk, struct flowi *fl, u32 mtu);
+extern void                     ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info);
+extern void                     ipv6_local_rxpmtu(struct sock *sk, struct flowi6 *fl6, u32 mtu);
 
 extern int inet6_release(struct socket *sock);
 extern int inet6_bind(struct socket *sock, struct sockaddr *uaddr, 
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 62c0ce2d1dc8..8650e7bf2ed0 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -341,6 +341,9 @@ struct ieee80211_bss_conf {
  *      the off-channel channel when a remain-on-channel offload is done
  *      in hardware -- normal packets still flow and are expected to be
  *      handled properly by the device.
+ * @IEEE80211_TX_INTFL_TKIP_MIC_FAILURE: Marks this packet to be used for TKIP
+ *      testing. It will be sent out with incorrect Michael MIC key to allow
+ *      TKIP countermeasures to be tested.
  *
  * Note: If you have to add new flags to the enumeration, then don't
  *       forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.
@@ -370,6 +373,7 @@ enum mac80211_tx_control_flags {
         IEEE80211_TX_CTL_LDPC                   = BIT(22),
         IEEE80211_TX_CTL_STBC                   = BIT(23) | BIT(24),
         IEEE80211_TX_CTL_TX_OFFCHAN             = BIT(25),
+        IEEE80211_TX_INTFL_TKIP_MIC_FAILURE     = BIT(26),
 };
 
 #define IEEE80211_TX_CTL_STBC_SHIFT             23
@@ -595,9 +599,10 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  *      the frame.
  * @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on
  *      the frame.
- * @RX_FLAG_TSFT: The timestamp passed in the RX status (@mactime field)
- *      is valid. This is useful in monitor mode and necessary for beacon frames
- *      to enable IBSS merging.
+ * @RX_FLAG_MACTIME_MPDU: The timestamp passed in the RX status (@mactime
+ *      field) is valid and contains the time the first symbol of the MPDU
+ *      was received. This is useful in monitor mode and for proper IBSS
+ *      merging.
  * @RX_FLAG_SHORTPRE: Short preamble was used for this frame
  * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
  * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
@@ -610,7 +615,7 @@ enum mac80211_rx_flags {
         RX_FLAG_IV_STRIPPED     = 1<<4,
         RX_FLAG_FAILED_FCS_CRC  = 1<<5,
         RX_FLAG_FAILED_PLCP_CRC = 1<<6,
-        RX_FLAG_TSFT            = 1<<7,
+        RX_FLAG_MACTIME_MPDU    = 1<<7,
         RX_FLAG_SHORTPRE        = 1<<8,
         RX_FLAG_HT              = 1<<9,
         RX_FLAG_40MHZ           = 1<<10,
@@ -1069,6 +1074,13 @@ enum ieee80211_tkip_key_type {
  *      to decrypt group addressed frames, then IBSS RSN support is still
  *      possible but software crypto will be used. Advertise the wiphy flag
  *      only in that case.
+ *
+ * @IEEE80211_HW_AP_LINK_PS: When operating in AP mode the device
+ *      autonomously manages the PS status of connected stations. When
+ *      this flag is set mac80211 will not trigger PS mode for connected
+ *      stations based on the PM bit of incoming frames.
+ *      Use ieee80211_start_ps()/ieee8021_end_ps() to manually configure
+ *      the PS mode of connected stations.
  */
 enum ieee80211_hw_flags {
         IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
@@ -1093,6 +1105,7 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_CONNECTION_MONITOR                 = 1<<19,
         IEEE80211_HW_SUPPORTS_CQM_RSSI                  = 1<<20,
         IEEE80211_HW_SUPPORTS_PER_STA_GTK               = 1<<21,
+        IEEE80211_HW_AP_LINK_PS                         = 1<<22,
 };
 
 /**
@@ -1147,6 +1160,17 @@ enum ieee80211_hw_flags {
  * @napi_weight: weight used for NAPI polling.  You must specify an
  *      appropriate value here if a napi_poll operation is provided
  *      by your driver.
+
+ * @max_rx_aggregation_subframes: maximum buffer size (number of
+ *      sub-frames) to be used for A-MPDU block ack receiver
+ *      aggregation.
+ *      This is only relevant if the device has restrictions on the
+ *      number of subframes, if it relies on mac80211 to do reordering
+ *      it shouldn't be set.
+ *
+ * @max_tx_aggregation_subframes: maximum number of subframes in an
+ *      aggregate an HT driver will transmit, used by the peer as a
+ *      hint to size its reorder buffer.
  */
 struct ieee80211_hw {
         struct ieee80211_conf conf;
@@ -1165,6 +1189,8 @@ struct ieee80211_hw {
         u8 max_rates;
         u8 max_report_rates;
         u8 max_rate_tries;
+        u8 max_rx_aggregation_subframes;
+        u8 max_tx_aggregation_subframes;
 };
 
 /**
@@ -1688,7 +1714,9 @@ enum ieee80211_ampdu_mlme_action {
  *      station, AP, IBSS/WDS/mesh peer etc. This callback can sleep.
  *
  * @sta_notify: Notifies low level driver about power state transition of an
- *      associated station, AP,  IBSS/WDS/mesh peer etc. Must be atomic.
+ *      associated station, AP,  IBSS/WDS/mesh peer etc. For a VIF operating
+ *      in AP mode, this callback will not be called when the flag
+ *      %IEEE80211_HW_AP_LINK_PS is set. Must be atomic.
  *
  * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
  *      bursting) for a hardware TX queue.
@@ -1723,6 +1751,10 @@ enum ieee80211_ampdu_mlme_action {
  *      ieee80211_ampdu_mlme_action. Starting sequence number (@ssn)
  *      is the first frame we expect to perform the action on. Notice
  *      that TX/RX_STOP can pass NULL for this parameter.
+ *      The @buf_size parameter is only valid when the action is set to
+ *      %IEEE80211_AMPDU_TX_OPERATIONAL and indicates the peer's reorder
+ *      buffer size (number of subframes) for this session -- aggregates
+ *      containing more subframes than this may not be transmitted to the peer.
  *      Returns a negative error code on failure.
  *      The callback can sleep.
  *
@@ -1767,9 +1799,18 @@ enum ieee80211_ampdu_mlme_action {
  *      ieee80211_remain_on_channel_expired(). This callback may sleep.
  * @cancel_remain_on_channel: Requests that an ongoing off-channel period is
  *      aborted before it expires. This callback may sleep.
+ * @offchannel_tx: Transmit frame on another channel, wait for a response
+ *      and return. Reliable TX status must be reported for the frame. If the
+ *      return value is 1, then the @remain_on_channel will be used with a
+ *      regular transmission (if supported.)
+ * @offchannel_tx_cancel_wait: cancel wait associated with offchannel TX
+ *
+ * @set_ringparam: Set tx and rx ring sizes.
+ *
+ * @get_ringparam: Get tx and rx ring current and maximum sizes.
  */
 struct ieee80211_ops {
-        int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
+        void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
         int (*start)(struct ieee80211_hw *hw);
         void (*stop)(struct ieee80211_hw *hw);
         int (*add_interface)(struct ieee80211_hw *hw,
@@ -1825,7 +1866,8 @@ struct ieee80211_ops {
         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);
+                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                            u8 buf_size);
         int (*get_survey)(struct ieee80211_hw *hw, int idx,
                 struct survey_info *survey);
         void (*rfkill_poll)(struct ieee80211_hw *hw);
@@ -1845,6 +1887,14 @@ struct ieee80211_ops {
                                  enum nl80211_channel_type channel_type,
                                  int duration);
         int (*cancel_remain_on_channel)(struct ieee80211_hw *hw);
+        int (*offchannel_tx)(struct ieee80211_hw *hw, struct sk_buff *skb,
+                             struct ieee80211_channel *chan,
+                             enum nl80211_channel_type channel_type,
+                             unsigned int wait);
+        int (*offchannel_tx_cancel_wait)(struct ieee80211_hw *hw);
+        int (*set_ringparam)(struct ieee80211_hw *hw, u32 tx, u32 rx);
+        void (*get_ringparam)(struct ieee80211_hw *hw,
+                              u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max);
 };
 
 /**
@@ -2113,6 +2163,48 @@ static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
         local_bh_enable();
 }
 
+/**
+ * ieee80211_sta_ps_transition - PS transition for connected sta
+ *
+ * When operating in AP mode with the %IEEE80211_HW_AP_LINK_PS
+ * flag set, use this function to inform mac80211 about a connected station
+ * entering/leaving PS mode.
+ *
+ * This function may not be called in IRQ context or with softirqs enabled.
+ *
+ * Calls to this function for a single hardware must be synchronized against
+ * each other.
+ *
+ * The function returns -EINVAL when the requested PS mode is already set.
+ *
+ * @sta: currently connected sta
+ * @start: start or stop PS
+ */
+int ieee80211_sta_ps_transition(struct ieee80211_sta *sta, bool start);
+
+/**
+ * ieee80211_sta_ps_transition_ni - PS transition for connected sta
+ *                                  (in process context)
+ *
+ * Like ieee80211_sta_ps_transition() but can be called in process context
+ * (internally disables bottom halves). Concurrent call restriction still
+ * applies.
+ *
+ * @sta: currently connected sta
+ * @start: start or stop PS
+ */
+static inline int ieee80211_sta_ps_transition_ni(struct ieee80211_sta *sta,
+                                                  bool start)
+{
+        int ret;
+
+        local_bh_disable();
+        ret = ieee80211_sta_ps_transition(sta, start);
+        local_bh_enable();
+
+        return ret;
+}
+
 /*
  * The TX headroom reserved by mac80211 for its own tx_status functions.
  * This is enough for the radiotap header.
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 1bf812b21fb7..3ae491932bc8 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -27,6 +27,7 @@ struct sock;
 struct ctl_table_header;
 struct net_generic;
 struct sock;
+struct netns_ipvs;
 
 
 #define NETDEV_HASHBITS    8
@@ -94,6 +95,7 @@ struct net {
 #ifdef CONFIG_XFRM
         struct netns_xfrm       xfrm;
 #endif
+        struct netns_ipvs       *ipvs;
 };
 
 
diff --git a/include/net/netevent.h b/include/net/netevent.h
index e82b7bab3ff3..22b239c17eaa 100644
--- a/include/net/netevent.h
+++ b/include/net/netevent.h
@@ -21,7 +21,6 @@ struct netevent_redirect {
 
 enum netevent_notif_type {
         NETEVENT_NEIGH_UPDATE = 1, /* arg is struct neighbour ptr */
-        NETEVENT_PMTU_UPDATE,      /* arg is struct dst_entry ptr */
         NETEVENT_REDIRECT,         /* arg is struct netevent_redirect ptr */
 };
 
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d85cff10e169..d0d13378991e 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -50,11 +50,24 @@ union nf_conntrack_expect_proto {
 /* per conntrack: application helper private data */
 union nf_conntrack_help {
         /* insert conntrack helper private data (master) here */
+#if defined(CONFIG_NF_CONNTRACK_FTP) || defined(CONFIG_NF_CONNTRACK_FTP_MODULE)
         struct nf_ct_ftp_master ct_ftp_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_PPTP) || \
+    defined(CONFIG_NF_CONNTRACK_PPTP_MODULE)
         struct nf_ct_pptp_master ct_pptp_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_H323) || \
+    defined(CONFIG_NF_CONNTRACK_H323_MODULE)
         struct nf_ct_h323_master ct_h323_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_SANE) || \
+    defined(CONFIG_NF_CONNTRACK_SANE_MODULE)
         struct nf_ct_sane_master ct_sane_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_SIP) || defined(CONFIG_NF_CONNTRACK_SIP_MODULE)
         struct nf_ct_sip_master ct_sip_info;
+#endif
 };
 
 #include <linux/types.h>
@@ -116,14 +129,14 @@ struct nf_conn {
         u_int32_t secmark;
 #endif
 
-        /* Storage reserved for other modules: */
-        union nf_conntrack_proto proto;
-
         /* Extensions */
         struct nf_ct_ext *ext;
 #ifdef CONFIG_NET_NS
         struct net *ct_net;
 #endif
+
+        /* Storage reserved for other modules, must be the last member */
+        union nf_conntrack_proto proto;
 };
 
 static inline struct nf_conn *
@@ -189,9 +202,9 @@ extern void nf_ct_l3proto_module_put(unsigned short l3proto);
  * Allocate a hashtable of hlist_head (if nulls == 0),
  * or hlist_nulls_head (if nulls == 1)
  */
-extern void *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced, int nulls);
+extern void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls);
 
-extern void nf_ct_free_hashtable(void *hash, int vmalloced, unsigned int size);
+extern void nf_ct_free_hashtable(void *hash, unsigned int size);
 
 extern struct nf_conntrack_tuple_hash *
 __nf_conntrack_find(struct net *net, u16 zone,
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 349cefedc9f3..4283508b3e18 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -23,12 +23,17 @@ struct nf_conntrack_ecache {
 static inline struct nf_conntrack_ecache *
 nf_ct_ecache_find(const struct nf_conn *ct)
 {
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
         return nf_ct_ext_find(ct, NF_CT_EXT_ECACHE);
+#else
+        return NULL;
+#endif
 }
 
 static inline struct nf_conntrack_ecache *
 nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)
 {
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
         struct net *net = nf_ct_net(ct);
         struct nf_conntrack_ecache *e;
 
@@ -45,6 +50,9 @@ nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)
                 e->expmask = expmask;
         }
         return e;
+#else
+        return NULL;
+#endif
 };
 
 #ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -59,7 +67,7 @@ struct nf_ct_event_notifier {
         int (*fcn)(unsigned int events, struct nf_ct_event *item);
 };
 
-extern struct nf_ct_event_notifier *nf_conntrack_event_cb;
+extern struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;
 extern int nf_conntrack_register_notifier(struct nf_ct_event_notifier *nb);
 extern void nf_conntrack_unregister_notifier(struct nf_ct_event_notifier *nb);
 
@@ -156,7 +164,7 @@ struct nf_exp_event_notifier {
         int (*fcn)(unsigned int events, struct nf_exp_event *item);
 };
 
-extern struct nf_exp_event_notifier *nf_expect_event_cb;
+extern struct nf_exp_event_notifier __rcu *nf_expect_event_cb;
 extern int nf_ct_expect_register_notifier(struct nf_exp_event_notifier *nb);
 extern void nf_ct_expect_unregister_notifier(struct nf_exp_event_notifier *nb);
 
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 0772d296dfdb..2dcf31703acb 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -7,10 +7,19 @@
 
 enum nf_ct_ext_id {
         NF_CT_EXT_HELPER,
+#if defined(CONFIG_NF_NAT) || defined(CONFIG_NF_NAT_MODULE)
         NF_CT_EXT_NAT,
+#endif
         NF_CT_EXT_ACCT,
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
         NF_CT_EXT_ECACHE,
+#endif
+#ifdef CONFIG_NF_CONNTRACK_ZONES
         NF_CT_EXT_ZONE,
+#endif
+#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
+        NF_CT_EXT_TSTAMP,
+#endif
         NF_CT_EXT_NUM,
 };
 
@@ -19,6 +28,7 @@ enum nf_ct_ext_id {
 #define NF_CT_EXT_ACCT_TYPE struct nf_conn_counter
 #define NF_CT_EXT_ECACHE_TYPE struct nf_conntrack_ecache
 #define NF_CT_EXT_ZONE_TYPE struct nf_conntrack_zone
+#define NF_CT_EXT_TSTAMP_TYPE struct nf_conn_tstamp
 
 /* Extensions: optional stuff which isn't permanently in struct. */
 struct nf_ct_ext {
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 32c305dbdab6..f1c1311adc2c 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -63,4 +63,10 @@ static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)
 extern int nf_conntrack_helper_init(void);
 extern void nf_conntrack_helper_fini(void);
 
+extern int nf_conntrack_broadcast_help(struct sk_buff *skb,
+                                       unsigned int protoff,
+                                       struct nf_conn *ct,
+                                       enum ip_conntrack_info ctinfo,
+                                       unsigned int timeout);
+
 #endif /*_NF_CONNTRACK_HELPER_H*/
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index a7547611e8f1..e8010f445ae1 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -73,7 +73,7 @@ struct nf_conntrack_l3proto {
         struct module *me;
 };
 
-extern struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX];
+extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX];
 
 /* Protocol registration. */
 extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
diff --git a/include/net/netfilter/nf_conntrack_timestamp.h b/include/net/netfilter/nf_conntrack_timestamp.h
new file mode 100644
index 000000000000..fc9c82b1f06b
--- /dev/null
+++ b/include/net/netfilter/nf_conntrack_timestamp.h
@@ -0,0 +1,65 @@
+#ifndef _NF_CONNTRACK_TSTAMP_H
+#define _NF_CONNTRACK_TSTAMP_H
+
+#include <net/net_namespace.h>
+#include <linux/netfilter/nf_conntrack_common.h>
+#include <linux/netfilter/nf_conntrack_tuple_common.h>
+#include <net/netfilter/nf_conntrack.h>
+#include <net/netfilter/nf_conntrack_extend.h>
+
+struct nf_conn_tstamp {
+        u_int64_t start;
+        u_int64_t stop;
+};
+
+static inline
+struct nf_conn_tstamp *nf_conn_tstamp_find(const struct nf_conn *ct)
+{
+#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
+        return nf_ct_ext_find(ct, NF_CT_EXT_TSTAMP);
+#else
+        return NULL;
+#endif
+}
+
+static inline
+struct nf_conn_tstamp *nf_ct_tstamp_ext_add(struct nf_conn *ct, gfp_t gfp)
+{
+#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
+        struct net *net = nf_ct_net(ct);
+
+        if (!net->ct.sysctl_tstamp)
+                return NULL;
+
+        return nf_ct_ext_add(ct, NF_CT_EXT_TSTAMP, gfp);
+#else
+        return NULL;
+#endif
+};
+
+static inline bool nf_ct_tstamp_enabled(struct net *net)
+{
+        return net->ct.sysctl_tstamp != 0;
+}
+
+static inline void nf_ct_set_tstamp(struct net *net, bool enable)
+{
+        net->ct.sysctl_tstamp = enable;
+}
+
+#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
+extern int nf_conntrack_tstamp_init(struct net *net);
+extern void nf_conntrack_tstamp_fini(struct net *net);
+#else
+static inline int nf_conntrack_tstamp_init(struct net *net)
+{
+        return 0;
+}
+
+static inline void nf_conntrack_tstamp_fini(struct net *net)
+{
+        return;
+}
+#endif /* CONFIG_NF_CONNTRACK_TIMESTAMP */
+
+#endif /* _NF_CONNTRACK_TSTAMP_H */
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index f5f09f032a90..aff80b190c12 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -56,7 +56,9 @@ struct nf_nat_multi_range_compat {
 /* per conntrack: nat application helper private data */
 union nf_conntrack_nat_help {
         /* insert nat helper private data here */
+#if defined(CONFIG_NF_NAT_PPTP) || defined(CONFIG_NF_NAT_PPTP_MODULE)
         struct nf_nat_pptp nat_pptp_info;
+#endif
 };
 
 struct nf_conn;
@@ -84,7 +86,11 @@ extern int nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple,
 
 static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct)
 {
+#if defined(CONFIG_NF_NAT) || defined(CONFIG_NF_NAT_MODULE)
         return nf_ct_ext_find(ct, NF_CT_EXT_NAT);
+#else
+        return NULL;
+#endif
 }
 
 #else  /* !__KERNEL__: iptables wants this to compile. */
diff --git a/include/net/netfilter/nf_nat_core.h b/include/net/netfilter/nf_nat_core.h
index 33602ab66190..3dc7b98effeb 100644
--- a/include/net/netfilter/nf_nat_core.h
+++ b/include/net/netfilter/nf_nat_core.h
@@ -21,9 +21,9 @@ static inline int nf_nat_initialized(struct nf_conn *ct,
                                      enum nf_nat_manip_type manip)
 {
         if (manip == IP_NAT_MANIP_SRC)
-                return test_bit(IPS_SRC_NAT_DONE_BIT, &ct->status);
+                return ct->status & IPS_SRC_NAT_DONE;
         else
-                return test_bit(IPS_DST_NAT_DONE_BIT, &ct->status);
+                return ct->status & IPS_DST_NAT_DONE;
 }
 
 struct nlattr;
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 373f1a900cf4..8a3906a08f5f 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -856,18 +856,27 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
 #define NLA_PUT_BE16(skb, attrtype, value) \
         NLA_PUT_TYPE(skb, __be16, attrtype, value)
 
+#define NLA_PUT_NET16(skb, attrtype, value) \
+        NLA_PUT_BE16(skb, attrtype | NLA_F_NET_BYTEORDER, value)
+
 #define NLA_PUT_U32(skb, attrtype, value) \
         NLA_PUT_TYPE(skb, u32, attrtype, value)
 
 #define NLA_PUT_BE32(skb, attrtype, value) \
         NLA_PUT_TYPE(skb, __be32, attrtype, value)
 
+#define NLA_PUT_NET32(skb, attrtype, value) \
+        NLA_PUT_BE32(skb, attrtype | NLA_F_NET_BYTEORDER, value)
+
 #define NLA_PUT_U64(skb, attrtype, value) \
         NLA_PUT_TYPE(skb, u64, attrtype, value)
 
 #define NLA_PUT_BE64(skb, attrtype, value) \
         NLA_PUT_TYPE(skb, __be64, attrtype, value)
 
+#define NLA_PUT_NET64(skb, attrtype, value) \
+        NLA_PUT_BE64(skb, attrtype | NLA_F_NET_BYTEORDER, value)
+
 #define NLA_PUT_STRING(skb, attrtype, value) \
         NLA_PUT(skb, attrtype, strlen(value) + 1, value)
 
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index d4958d4c6574..341eb089349e 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -21,15 +21,15 @@ struct netns_ct {
         int                     sysctl_events;
         unsigned int            sysctl_events_retry_timeout;
         int                     sysctl_acct;
+        int                     sysctl_tstamp;
         int                     sysctl_checksum;
         unsigned int            sysctl_log_invalid; /* Log invalid packets */
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *sysctl_header;
         struct ctl_table_header *acct_sysctl_header;
+        struct ctl_table_header *tstamp_sysctl_header;
         struct ctl_table_header *event_sysctl_header;
 #endif
-        int                     hash_vmalloc;
-        int                     expect_vmalloc;
         char                    *slabname;
 };
 #endif
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index d68c3f121774..e2e2ef57eca2 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -43,7 +43,6 @@ struct netns_ipv4 {
         struct xt_table         *nat_table;
         struct hlist_head       *nat_bysource;
         unsigned int            nat_htable_size;
-        int                     nat_vmalloced;
 #endif
 
         int sysctl_icmp_echo_ignore_all;
diff --git a/include/net/phonet/pep.h b/include/net/phonet/pep.h
index b60b28c99e87..b669fe6dbc3b 100644
--- a/include/net/phonet/pep.h
+++ b/include/net/phonet/pep.h
@@ -28,7 +28,6 @@ struct pep_sock {
 
         /* XXX: union-ify listening vs connected stuff ? */
         /* Listening socket stuff: */
-        struct hlist_head       ackq;
         struct hlist_head       hlist;
 
         /* Connected socket stuff: */
@@ -45,10 +44,6 @@ struct pep_sock {
         u8                      tx_fc;  /* TX flow control */
         u8                      init_enable;    /* auto-enable at creation */
         u8                      aligned;
-#ifdef CONFIG_PHONET_PIPECTRLR
-        u8                      pipe_state;
-        struct sockaddr_pn      remote_pep;
-#endif
 };
 
 static inline struct pep_sock *pep_sk(struct sock *sk)
@@ -158,6 +153,7 @@ enum {
         PN_LEGACY_FLOW_CONTROL,
         PN_ONE_CREDIT_FLOW_CONTROL,
         PN_MULTI_CREDIT_FLOW_CONTROL,
+        PN_MAX_FLOW_CONTROL,
 };
 
 #define pn_flow_safe(fc) ((fc) >> 1)
@@ -169,21 +165,4 @@ enum {
         PEP_IND_READY,
 };
 
-#ifdef CONFIG_PHONET_PIPECTRLR
-#define PNS_PEP_CONNECT_UTID           0x02
-#define PNS_PIPE_CREATED_IND_UTID      0x04
-#define PNS_PIPE_ENABLE_UTID           0x0A
-#define PNS_PIPE_ENABLED_IND_UTID      0x0C
-#define PNS_PIPE_DISABLE_UTID          0x0F
-#define PNS_PIPE_DISABLED_IND_UTID     0x11
-#define PNS_PEP_DISCONNECT_UTID        0x06
-
-/* Used for tracking state of a pipe */
-enum {
-        PIPE_IDLE,
-        PIPE_DISABLED,
-        PIPE_ENABLED,
-};
-#endif /* CONFIG_PHONET_PIPECTRLR */
-
 #endif
diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h
index 5395e09187df..68e509750caa 100644
--- a/include/net/phonet/phonet.h
+++ b/include/net/phonet/phonet.h
@@ -36,6 +36,7 @@
 struct pn_sock {
         struct sock     sk;
         u16             sobject;
+        u16             dobject;
         u8              resource;
 };
 
diff --git a/include/net/protocol.h b/include/net/protocol.h
index dc07495bce4c..6f7eb800974a 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -38,7 +38,7 @@ struct net_protocol {
         void                    (*err_handler)(struct sk_buff *skb, u32 info);
         int                     (*gso_send_check)(struct sk_buff *skb);
         struct sk_buff         *(*gso_segment)(struct sk_buff *skb,
-                                               int features);
+                                               u32 features);
         struct sk_buff        **(*gro_receive)(struct sk_buff **head,
                                                struct sk_buff *skb);
         int                     (*gro_complete)(struct sk_buff *skb);
@@ -57,7 +57,7 @@ struct inet6_protocol {
 
         int     (*gso_send_check)(struct sk_buff *skb);
         struct sk_buff *(*gso_segment)(struct sk_buff *skb,
-                                       int features);
+                                       u32 features);
         struct sk_buff **(*gro_receive)(struct sk_buff **head,
                                         struct sk_buff *skb);
         int     (*gro_complete)(struct sk_buff *skb);
diff --git a/include/net/route.h b/include/net/route.h
index 93e10c453f6b..30d6cae3841a 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -49,36 +49,43 @@
 
 struct fib_nh;
 struct inet_peer;
+struct fib_info;
 struct rtable {
         struct dst_entry        dst;
 
-        /* Cache lookup keys */
-        struct flowi            fl;
+        /* Lookup key. */
+        __be32                  rt_key_dst;
+        __be32                  rt_key_src;
 
         int                     rt_genid;
         unsigned                rt_flags;
         __u16                   rt_type;
+        __u8                    rt_tos;
 
         __be32                  rt_dst; /* Path destination     */
         __be32                  rt_src; /* Path source          */
         int                     rt_iif;
+        int                     rt_oif;
+        __u32                   rt_mark;
 
         /* Info on neighbour */
         __be32                  rt_gateway;
 
         /* Miscellaneous cached information */
         __be32                  rt_spec_dst; /* RFC1122 specific destination */
+        u32                     rt_peer_genid;
         struct inet_peer        *peer; /* long-living peer info */
+        struct fib_info         *fi; /* for client ref to shared metrics */
 };
 
 static inline bool rt_is_input_route(struct rtable *rt)
 {
-        return rt->fl.iif != 0;
+        return rt->rt_iif != 0;
 }
 
 static inline bool rt_is_output_route(struct rtable *rt)
 {
-        return rt->fl.iif == 0;
+        return rt->rt_iif == 0;
 }
 
 struct ip_rt_acct {
@@ -115,9 +122,63 @@ 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(struct net *net);
-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);
+extern struct rtable *__ip_route_output_key(struct net *, const struct flowi4 *flp);
+extern struct rtable *ip_route_output_flow(struct net *, struct flowi4 *flp,
+                                           struct sock *sk);
+extern struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig);
+
+static inline struct rtable *ip_route_output_key(struct net *net, struct flowi4 *flp)
+{
+        return ip_route_output_flow(net, flp, NULL);
+}
+
+static inline struct rtable *ip_route_output(struct net *net, __be32 daddr,
+                                             __be32 saddr, u8 tos, int oif)
+{
+        struct flowi4 fl4 = {
+                .flowi4_oif = oif,
+                .daddr = daddr,
+                .saddr = saddr,
+                .flowi4_tos = tos,
+        };
+        return ip_route_output_key(net, &fl4);
+}
+
+static inline struct rtable *ip_route_output_ports(struct net *net, struct sock *sk,
+                                                   __be32 daddr, __be32 saddr,
+                                                   __be16 dport, __be16 sport,
+                                                   __u8 proto, __u8 tos, int oif)
+{
+        struct flowi4 fl4 = {
+                .flowi4_oif = oif,
+                .flowi4_flags = sk ? inet_sk_flowi_flags(sk) : 0,
+                .flowi4_mark = sk ? sk->sk_mark : 0,
+                .daddr = daddr,
+                .saddr = saddr,
+                .flowi4_tos = tos,
+                .flowi4_proto = proto,
+                .fl4_dport = dport,
+                .fl4_sport = sport,
+        };
+        if (sk)
+                security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+        return ip_route_output_flow(net, &fl4, sk);
+}
+
+static inline struct rtable *ip_route_output_gre(struct net *net,
+                                                 __be32 daddr, __be32 saddr,
+                                                 __be32 gre_key, __u8 tos, int oif)
+{
+        struct flowi4 fl4 = {
+                .flowi4_oif = oif,
+                .daddr = daddr,
+                .saddr = saddr,
+                .flowi4_tos = tos,
+                .flowi4_proto = IPPROTO_GRE,
+                .fl4_gre_key = gre_key,
+        };
+        return ip_route_output_key(net, &fl4);
+}
 
 extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
                                  u8 tos, struct net_device *devin, bool noref);
@@ -162,57 +223,68 @@ static inline char rt_tos2priority(u8 tos)
         return ip_tos2prio[IPTOS_TOS(tos)>>1];
 }
 
-static inline int ip_route_connect(struct rtable **rp, __be32 dst,
-                                   __be32 src, u32 tos, int oif, u8 protocol,
-                                   __be16 sport, __be16 dport, struct sock *sk,
-                                   int flags)
+static inline struct rtable *ip_route_connect(__be32 dst, __be32 src, u32 tos,
+                                              int oif, u8 protocol,
+                                              __be16 sport, __be16 dport,
+                                              struct sock *sk, bool can_sleep)
 {
-        struct flowi fl = { .oif = oif,
-                            .mark = sk->sk_mark,
-                            .fl4_dst = dst,
-                            .fl4_src = src,
-                            .fl4_tos = tos,
-                            .proto = protocol,
-                            .fl_ip_sport = sport,
-                            .fl_ip_dport = dport };
-        int err;
+        struct flowi4 fl4 = {
+                .flowi4_oif = oif,
+                .flowi4_mark = sk->sk_mark,
+                .daddr = dst,
+                .saddr = src,
+                .flowi4_tos = tos,
+                .flowi4_proto = protocol,
+                .fl4_sport = sport,
+                .fl4_dport = dport,
+        };
         struct net *net = sock_net(sk);
+        struct rtable *rt;
 
         if (inet_sk(sk)->transparent)
-                fl.flags |= FLOWI_FLAG_ANYSRC;
+                fl4.flowi4_flags |= FLOWI_FLAG_ANYSRC;
+        if (protocol == IPPROTO_TCP)
+                fl4.flowi4_flags |= FLOWI_FLAG_PRECOW_METRICS;
+        if (can_sleep)
+                fl4.flowi4_flags |= FLOWI_FLAG_CAN_SLEEP;
 
         if (!dst || !src) {
-                err = __ip_route_output_key(net, rp, &fl);
-                if (err)
-                        return err;
-                fl.fl4_dst = (*rp)->rt_dst;
-                fl.fl4_src = (*rp)->rt_src;
-                ip_rt_put(*rp);
-                *rp = NULL;
+                rt = __ip_route_output_key(net, &fl4);
+                if (IS_ERR(rt))
+                        return rt;
+                fl4.daddr = rt->rt_dst;
+                fl4.saddr = rt->rt_src;
+                ip_rt_put(rt);
         }
-        security_sk_classify_flow(sk, &fl);
-        return ip_route_output_flow(net, rp, &fl, sk, flags);
+        security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+        return ip_route_output_flow(net, &fl4, sk);
 }
 
-static inline int ip_route_newports(struct rtable **rp, u8 protocol,
-                                    __be16 sport, __be16 dport, struct sock *sk)
+static inline struct rtable *ip_route_newports(struct rtable *rt,
+                                               u8 protocol, __be16 orig_sport,
+                                               __be16 orig_dport, __be16 sport,
+                                               __be16 dport, struct sock *sk)
 {
-        if (sport != (*rp)->fl.fl_ip_sport ||
-            dport != (*rp)->fl.fl_ip_dport) {
-                struct flowi fl;
-
-                memcpy(&fl, &(*rp)->fl, sizeof(fl));
-                fl.fl_ip_sport = sport;
-                fl.fl_ip_dport = dport;
-                fl.proto = protocol;
+        if (sport != orig_sport || dport != orig_dport) {
+                struct flowi4 fl4 = {
+                        .flowi4_oif = rt->rt_oif,
+                        .flowi4_mark = rt->rt_mark,
+                        .daddr = rt->rt_key_dst,
+                        .saddr = rt->rt_key_src,
+                        .flowi4_tos = rt->rt_tos,
+                        .flowi4_proto = protocol,
+                        .fl4_sport = sport,
+                        .fl4_dport = dport
+                };
                 if (inet_sk(sk)->transparent)
-                        fl.flags |= FLOWI_FLAG_ANYSRC;
-                ip_rt_put(*rp);
-                *rp = NULL;
-                security_sk_classify_flow(sk, &fl);
-                return ip_route_output_flow(sock_net(sk), rp, &fl, sk, 0);
+                        fl4.flowi4_flags |= FLOWI_FLAG_ANYSRC;
+                if (protocol == IPPROTO_TCP)
+                        fl4.flowi4_flags |= FLOWI_FLAG_PRECOW_METRICS;
+                ip_rt_put(rt);
+                security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+                return ip_route_output_flow(sock_net(sk), &fl4, sk);
         }
-        return 0;
+        return rt;
 }
 
 extern void rt_bind_peer(struct rtable *rt, int create);
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 04f8556313d5..a9505b6a18e3 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -31,10 +31,12 @@ enum qdisc_state_t {
  * following bits are only changed while qdisc lock is held
  */
 enum qdisc___state_t {
-        __QDISC___STATE_RUNNING,
+        __QDISC___STATE_RUNNING = 1,
+        __QDISC___STATE_THROTTLED = 2,
 };
 
 struct qdisc_size_table {
+        struct rcu_head         rcu;
         struct list_head        list;
         struct tc_sizespec      szopts;
         int                     refcnt;
@@ -46,14 +48,13 @@ struct Qdisc {
         struct sk_buff *        (*dequeue)(struct Qdisc *dev);
         unsigned                flags;
 #define TCQ_F_BUILTIN           1
-#define TCQ_F_THROTTLED         2
-#define TCQ_F_INGRESS           4
-#define TCQ_F_CAN_BYPASS        8
-#define TCQ_F_MQROOT            16
+#define TCQ_F_INGRESS           2
+#define TCQ_F_CAN_BYPASS        4
+#define TCQ_F_MQROOT            8
 #define TCQ_F_WARN_NONWC        (1 << 16)
         int                     padded;
         struct Qdisc_ops        *ops;
-        struct qdisc_size_table *stab;
+        struct qdisc_size_table __rcu *stab;
         struct list_head        list;
         u32                     handle;
         u32                     parent;
@@ -78,25 +79,44 @@ struct Qdisc {
         unsigned long           state;
         struct sk_buff_head     q;
         struct gnet_stats_basic_packed bstats;
-        unsigned long           __state;
+        unsigned int            __state;
         struct gnet_stats_queue qstats;
         struct rcu_head         rcu_head;
         spinlock_t              busylock;
+        u32                     limit;
 };
 
-static inline bool qdisc_is_running(struct Qdisc *qdisc)
+static inline bool qdisc_is_running(const struct Qdisc *qdisc)
 {
-        return test_bit(__QDISC___STATE_RUNNING, &qdisc->__state);
+        return (qdisc->__state & __QDISC___STATE_RUNNING) ? true : false;
 }
 
 static inline bool qdisc_run_begin(struct Qdisc *qdisc)
 {
-        return !__test_and_set_bit(__QDISC___STATE_RUNNING, &qdisc->__state);
+        if (qdisc_is_running(qdisc))
+                return false;
+        qdisc->__state |= __QDISC___STATE_RUNNING;
+        return true;
 }
 
 static inline void qdisc_run_end(struct Qdisc *qdisc)
 {
-        __clear_bit(__QDISC___STATE_RUNNING, &qdisc->__state);
+        qdisc->__state &= ~__QDISC___STATE_RUNNING;
+}
+
+static inline bool qdisc_is_throttled(const struct Qdisc *qdisc)
+{
+        return (qdisc->__state & __QDISC___STATE_THROTTLED) ? true : false;
+}
+
+static inline void qdisc_throttled(struct Qdisc *qdisc)
+{
+        qdisc->__state |= __QDISC___STATE_THROTTLED;
+}
+
+static inline void qdisc_unthrottled(struct Qdisc *qdisc)
+{
+        qdisc->__state &= ~__QDISC___STATE_THROTTLED;
 }
 
 struct Qdisc_class_ops {
@@ -331,8 +351,8 @@ extern struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
                                  struct Qdisc_ops *ops);
 extern struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
                                        struct Qdisc_ops *ops, u32 parentid);
-extern void qdisc_calculate_pkt_len(struct sk_buff *skb,
-                                   struct qdisc_size_table *stab);
+extern void __qdisc_calculate_pkt_len(struct sk_buff *skb,
+                                      const struct qdisc_size_table *stab);
 extern void tcf_destroy(struct tcf_proto *tp);
 extern void tcf_destroy_chain(struct tcf_proto **fl);
 
@@ -411,12 +431,20 @@ enum net_xmit_qdisc_t {
 #define net_xmit_drop_count(e)  (1)
 #endif
 
-static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+static inline void qdisc_calculate_pkt_len(struct sk_buff *skb,
+                                           const struct Qdisc *sch)
 {
 #ifdef CONFIG_NET_SCHED
-        if (sch->stab)
-                qdisc_calculate_pkt_len(skb, sch->stab);
+        struct qdisc_size_table *stab = rcu_dereference_bh(sch->stab);
+
+        if (stab)
+                __qdisc_calculate_pkt_len(skb, stab);
 #endif
+}
+
+static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
+{
+        qdisc_calculate_pkt_len(skb, sch);
         return sch->enqueue(skb, sch);
 }
 
diff --git a/include/net/sock.h b/include/net/sock.h
index bc1cf7d88ccb..da0534d3401c 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -281,7 +281,7 @@ struct sock {
         int                     sk_rcvbuf;
 
         struct sk_filter __rcu  *sk_filter;
-        struct socket_wq        *sk_wq;
+        struct socket_wq __rcu  *sk_wq;
 
 #ifdef CONFIG_NET_DMA
         struct sk_buff_head     sk_async_wait_queue;
@@ -1191,7 +1191,7 @@ extern void sk_filter_release_rcu(struct rcu_head *rcu);
 static inline void sk_filter_release(struct sk_filter *fp)
 {
         if (atomic_dec_and_test(&fp->refcnt))
-                call_rcu_bh(&fp->rcu, sk_filter_release_rcu);
+                call_rcu(&fp->rcu, sk_filter_release_rcu);
 }
 
 static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp)
@@ -1266,7 +1266,8 @@ static inline void sk_set_socket(struct sock *sk, struct socket *sock)
 
 static inline wait_queue_head_t *sk_sleep(struct sock *sk)
 {
-        return &sk->sk_wq->wait;
+        BUILD_BUG_ON(offsetof(struct socket_wq, wait) != 0);
+        return &rcu_dereference_raw(sk->sk_wq)->wait;
 }
 /* Detach socket from process context.
  * Announce socket dead, detach it from wait queue and inode.
@@ -1287,7 +1288,7 @@ static inline void sock_orphan(struct sock *sk)
 static inline void sock_graft(struct sock *sk, struct socket *parent)
 {
         write_lock_bh(&sk->sk_callback_lock);
-        rcu_assign_pointer(sk->sk_wq, parent->wq);
+        sk->sk_wq = parent->wq;
         parent->sk = sk;
         sk_set_socket(sk, parent);
         security_sock_graft(sk, parent);
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 38509f047382..cda30ea354a2 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -196,6 +196,9 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 /* TCP thin-stream limits */
 #define TCP_THIN_LINEAR_RETRIES 6       /* After 6 linear retries, do exp. backoff */
 
+/* TCP initial congestion window as per draft-hkchu-tcpm-initcwnd-01 */
+#define TCP_INIT_CWND           10
+
 extern struct inet_timewait_death_row tcp_death_row;
 
 /* sysctl variables for tcp */
@@ -799,15 +802,6 @@ static inline __u32 tcp_current_ssthresh(const struct sock *sk)
 /* Use define here intentionally to get WARN_ON location shown at the caller */
 #define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out)
 
-/*
- * Convert RFC 3390 larger initial window into an equivalent number of packets.
- * This is based on the numbers specified in RFC 5681, 3.1.
- */
-static inline u32 rfc3390_bytes_to_packets(const u32 smss)
-{
-        return smss <= 1095 ? 4 : (smss > 2190 ? 2 : 3);
-}
-
 extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);
 extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst);
 
@@ -1074,8 +1068,6 @@ static inline int tcp_paws_reject(const struct tcp_options_received *rx_opt,
         return 1;
 }
 
-#define TCP_CHECK_TIMER(sk) do { } while (0)
-
 static inline void tcp_mib_init(struct net *net)
 {
         /* See RFC 2012 */
@@ -1404,7 +1396,7 @@ extern struct request_sock_ops tcp6_request_sock_ops;
 extern void tcp_v4_destroy_sock(struct sock *sk);
 
 extern int tcp_v4_gso_send_check(struct sk_buff *skb);
-extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features);
+extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, u32 features);
 extern struct sk_buff **tcp_gro_receive(struct sk_buff **head,
                                         struct sk_buff *skb);
 extern struct sk_buff **tcp4_gro_receive(struct sk_buff **head,
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 42a0eb68b7b6..eeb077dd735f 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -14,7 +14,7 @@ extern struct proto udpv6_prot;
 extern struct proto udplitev6_prot;
 extern struct proto tcpv6_prot;
 
-struct flowi;
+struct flowi6;
 
 /* extention headers */
 extern int                              ipv6_exthdrs_init(void);
@@ -42,7 +42,7 @@ extern int			datagram_recv_ctl(struct sock *sk,
 
 extern int                      datagram_send_ctl(struct net *net,
                                                   struct msghdr *msg,
-                                                  struct flowi *fl,
+                                                  struct flowi6 *fl6,
                                                   struct ipv6_txoptions *opt,
                                                   int *hlimit, int *tclass,
                                                   int *dontfrag);
diff --git a/include/net/udp.h b/include/net/udp.h
index bb967dd59bf7..67ea6fcb3ec0 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -144,6 +144,17 @@ static inline __wsum udp_csum_outgoing(struct sock *sk, struct sk_buff *skb)
         return csum;
 }
 
+static inline __wsum udp_csum(struct sk_buff *skb)
+{
+        __wsum csum = csum_partial(skb_transport_header(skb),
+                                   sizeof(struct udphdr), skb->csum);
+
+        for (skb = skb_shinfo(skb)->frag_list; skb; skb = skb->next) {
+                csum = csum_add(csum, skb->csum);
+        }
+        return csum;
+}
+
 /* hash routines shared between UDPv4/6 and UDP-Litev4/6 */
 static inline void udp_lib_hash(struct sock *sk)
 {
@@ -245,5 +256,5 @@ extern void udp4_proc_exit(void);
 extern void udp_init(void);
 
 extern int udp4_ufo_send_check(struct sk_buff *skb);
-extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, int features);
+extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, u32 features);
 #endif  /* _UDP_H */
diff --git a/include/net/udplite.h b/include/net/udplite.h
index afdffe607b24..673a024c6b2a 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -115,6 +115,18 @@ static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
         return csum;
 }
 
+static inline __wsum udplite_csum(struct sk_buff *skb)
+{
+        struct sock *sk = skb->sk;
+        int cscov = udplite_sender_cscov(udp_sk(sk), udp_hdr(skb));
+        const int off = skb_transport_offset(skb);
+        const int len = skb->len - off;
+
+        skb->ip_summed = CHECKSUM_NONE;     /* no HW support for checksumming */
+
+        return skb_checksum(skb, off, min(cscov, len), 0);
+}
+
 extern void     udplite4_register(void);
 extern int      udplite_get_port(struct sock *sk, unsigned short snum,
                         int (*scmp)(const struct sock *, const struct sock *));
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index b9f385da758e..42a8c32a10e2 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -36,6 +36,7 @@
 #define XFRM_PROTO_ROUTING      IPPROTO_ROUTING
 #define XFRM_PROTO_DSTOPTS      IPPROTO_DSTOPTS
 
+#define XFRM_ALIGN4(len)        (((len) + 3) & ~3)
 #define XFRM_ALIGN8(len)        (((len) + 7) & ~7)
 #define MODULE_ALIAS_XFRM_MODE(family, encap) \
         MODULE_ALIAS("xfrm-mode-" __stringify(family) "-" __stringify(encap))
@@ -185,9 +186,14 @@ struct xfrm_state {
 
         /* State for replay detection */
         struct xfrm_replay_state replay;
+        struct xfrm_replay_state_esn *replay_esn;
 
         /* Replay detection state at the time we sent the last notification */
         struct xfrm_replay_state preplay;
+        struct xfrm_replay_state_esn *preplay_esn;
+
+        /* The functions for replay detection. */
+        struct xfrm_replay      *repl;
 
         /* internal flag that only holds state for delayed aevent at the
          * moment
@@ -258,6 +264,15 @@ struct km_event {
         struct net *net;
 };
 
+struct xfrm_replay {
+        void    (*advance)(struct xfrm_state *x, __be32 net_seq);
+        int     (*check)(struct xfrm_state *x,
+                         struct sk_buff *skb,
+                         __be32 net_seq);
+        void    (*notify)(struct xfrm_state *x, int event);
+        int     (*overflow)(struct xfrm_state *x, struct sk_buff *skb);
+};
+
 struct net_device;
 struct xfrm_type;
 struct xfrm_dst;
@@ -266,25 +281,26 @@ struct xfrm_policy_afinfo {
         struct dst_ops          *dst_ops;
         void                    (*garbage_collect)(struct net *net);
         struct dst_entry        *(*dst_lookup)(struct net *net, int tos,
-                                               xfrm_address_t *saddr,
-                                               xfrm_address_t *daddr);
+                                               const xfrm_address_t *saddr,
+                                               const xfrm_address_t *daddr);
         int                     (*get_saddr)(struct net *net, xfrm_address_t *saddr, xfrm_address_t *daddr);
         void                    (*decode_session)(struct sk_buff *skb,
                                                   struct flowi *fl,
                                                   int reverse);
-        int                     (*get_tos)(struct flowi *fl);
+        int                     (*get_tos)(const struct flowi *fl);
         int                     (*init_path)(struct xfrm_dst *path,
                                              struct dst_entry *dst,
                                              int nfheader_len);
         int                     (*fill_dst)(struct xfrm_dst *xdst,
                                             struct net_device *dev,
-                                            struct flowi *fl);
+                                            const struct flowi *fl);
+        struct dst_entry        *(*blackhole_route)(struct net *net, struct dst_entry *orig);
 };
 
 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
 extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
-extern void km_policy_notify(struct xfrm_policy *xp, int dir, struct km_event *c);
-extern void km_state_notify(struct xfrm_state *x, struct km_event *c);
+extern void km_policy_notify(struct xfrm_policy *xp, int dir, const struct km_event *c);
+extern void km_state_notify(struct xfrm_state *x, const struct km_event *c);
 
 struct xfrm_tmpl;
 extern int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol);
@@ -299,9 +315,12 @@ struct xfrm_state_afinfo {
         const struct xfrm_type  *type_map[IPPROTO_MAX];
         struct xfrm_mode        *mode_map[XFRM_MODE_MAX];
         int                     (*init_flags)(struct xfrm_state *x);
-        void                    (*init_tempsel)(struct xfrm_selector *sel, struct flowi *fl);
-        void                    (*init_temprop)(struct xfrm_state *x, struct xfrm_tmpl *tmpl,
-                                                xfrm_address_t *daddr, xfrm_address_t *saddr);
+        void                    (*init_tempsel)(struct xfrm_selector *sel,
+                                                const struct flowi *fl);
+        void                    (*init_temprop)(struct xfrm_state *x,
+                                                const struct xfrm_tmpl *tmpl,
+                                                const xfrm_address_t *daddr,
+                                                const xfrm_address_t *saddr);
         int                     (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);
         int                     (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);
         int                     (*output)(struct sk_buff *skb);
@@ -332,7 +351,8 @@ struct xfrm_type {
         void                    (*destructor)(struct xfrm_state *);
         int                     (*input)(struct xfrm_state *, struct sk_buff *skb);
         int                     (*output)(struct xfrm_state *, struct sk_buff *pskb);
-        int                     (*reject)(struct xfrm_state *, struct sk_buff *, struct flowi *);
+        int                     (*reject)(struct xfrm_state *, struct sk_buff *,
+                                          const struct flowi *);
         int                     (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);
         /* Estimate maximal size of result of transformation of a dgram */
         u32                     (*get_mtu)(struct xfrm_state *, int size);
@@ -501,7 +521,7 @@ struct xfrm_policy {
         struct xfrm_tmpl        xfrm_vec[XFRM_MAX_DEPTH];
 };
 
-static inline struct net *xp_net(struct xfrm_policy *xp)
+static inline struct net *xp_net(const struct xfrm_policy *xp)
 {
         return read_pnet(&xp->xp_net);
 }
@@ -545,13 +565,17 @@ struct xfrm_migrate {
 struct xfrm_mgr {
         struct list_head        list;
         char                    *id;
-        int                     (*notify)(struct xfrm_state *x, struct km_event *c);
+        int                     (*notify)(struct xfrm_state *x, const struct km_event *c);
         int                     (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
         struct xfrm_policy      *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
         int                     (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
-        int                     (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
+        int                     (*notify_policy)(struct xfrm_policy *x, int dir, const struct km_event *c);
         int                     (*report)(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
-        int                     (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles, struct xfrm_kmaddress *k);
+        int                     (*migrate)(const struct xfrm_selector *sel,
+                                           u8 dir, u8 type,
+                                           const struct xfrm_migrate *m,
+                                           int num_bundles,
+                                           const struct xfrm_kmaddress *k);
 };
 
 extern int xfrm_register_km(struct xfrm_mgr *km);
@@ -570,8 +594,14 @@ struct xfrm_skb_cb {
 
         /* Sequence number for replay protection. */
         union {
-                u64 output;
-                __be32 input;
+                struct {
+                        __u32 low;
+                        __u32 hi;
+                } output;
+                struct {
+                        __be32 low;
+                        __be32 hi;
+                } input;
         } seq;
 };
 
@@ -675,6 +705,8 @@ extern void xfrm_audit_state_delete(struct xfrm_state *x, int result,
                                     u32 auid, u32 ses, u32 secid);
 extern void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
                                              struct sk_buff *skb);
+extern void xfrm_audit_state_replay(struct xfrm_state *x,
+                                    struct sk_buff *skb, __be32 net_seq);
 extern void xfrm_audit_state_notfound_simple(struct sk_buff *skb, u16 family);
 extern void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family,
                                       __be32 net_spi, __be32 net_seq);
@@ -707,6 +739,11 @@ static inline void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
 {
 }
 
+static inline void xfrm_audit_state_replay(struct xfrm_state *x,
+                                           struct sk_buff *skb, __be32 net_seq)
+{
+}
+
 static inline void xfrm_audit_state_notfound_simple(struct sk_buff *skb,
                                       u16 family)
 {
@@ -762,10 +799,11 @@ static inline void xfrm_state_hold(struct xfrm_state *x)
         atomic_inc(&x->refcnt);
 }
 
-static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
+static inline bool addr_match(const void *token1, const void *token2,
+                              int prefixlen)
 {
-        __be32 *a1 = token1;
-        __be32 *a2 = token2;
+        const __be32 *a1 = token1;
+        const __be32 *a2 = token2;
         int pdw;
         int pbi;
 
@@ -774,7 +812,7 @@ static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
 
         if (pdw)
                 if (memcmp(a1, a2, pdw << 2))
-                        return 0;
+                        return false;
 
         if (pbi) {
                 __be32 mask;
@@ -782,32 +820,32 @@ static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
                 mask = htonl((0xffffffff) << (32 - pbi));
 
                 if ((a1[pdw] ^ a2[pdw]) & mask)
-                        return 0;
+                        return false;
         }
 
-        return 1;
+        return true;
 }
 
 static __inline__
-__be16 xfrm_flowi_sport(struct flowi *fl)
+__be16 xfrm_flowi_sport(const struct flowi *fl, const union flowi_uli *uli)
 {
         __be16 port;
-        switch(fl->proto) {
+        switch(fl->flowi_proto) {
         case IPPROTO_TCP:
         case IPPROTO_UDP:
         case IPPROTO_UDPLITE:
         case IPPROTO_SCTP:
-                port = fl->fl_ip_sport;
+                port = uli->ports.sport;
                 break;
         case IPPROTO_ICMP:
         case IPPROTO_ICMPV6:
-                port = htons(fl->fl_icmp_type);
+                port = htons(uli->icmpt.type);
                 break;
         case IPPROTO_MH:
-                port = htons(fl->fl_mh_type);
+                port = htons(uli->mht.type);
                 break;
         case IPPROTO_GRE:
-                port = htons(ntohl(fl->fl_gre_key) >> 16);
+                port = htons(ntohl(uli->gre_key) >> 16);
                 break;
         default:
                 port = 0;       /*XXX*/
@@ -816,22 +854,22 @@ __be16 xfrm_flowi_sport(struct flowi *fl)
 }
 
 static __inline__
-__be16 xfrm_flowi_dport(struct flowi *fl)
+__be16 xfrm_flowi_dport(const struct flowi *fl, const union flowi_uli *uli)
 {
         __be16 port;
-        switch(fl->proto) {
+        switch(fl->flowi_proto) {
         case IPPROTO_TCP:
         case IPPROTO_UDP:
         case IPPROTO_UDPLITE:
         case IPPROTO_SCTP:
-                port = fl->fl_ip_dport;
+                port = uli->ports.dport;
                 break;
         case IPPROTO_ICMP:
         case IPPROTO_ICMPV6:
-                port = htons(fl->fl_icmp_code);
+                port = htons(uli->icmpt.code);
                 break;
         case IPPROTO_GRE:
-                port = htons(ntohl(fl->fl_gre_key) & 0xffff);
+                port = htons(ntohl(uli->gre_key) & 0xffff);
                 break;
         default:
                 port = 0;       /*XXX*/
@@ -839,7 +877,8 @@ __be16 xfrm_flowi_dport(struct flowi *fl)
         return port;
 }
 
-extern int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl,
+extern int xfrm_selector_match(const struct xfrm_selector *sel,
+                               const struct flowi *fl,
                                unsigned short family);
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
@@ -947,7 +986,7 @@ secpath_reset(struct sk_buff *skb)
 }
 
 static inline int
-xfrm_addr_any(xfrm_address_t *addr, unsigned short family)
+xfrm_addr_any(const xfrm_address_t *addr, unsigned short family)
 {
         switch (family) {
         case AF_INET:
@@ -959,21 +998,21 @@ xfrm_addr_any(xfrm_address_t *addr, unsigned short family)
 }
 
 static inline int
-__xfrm4_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x)
+__xfrm4_state_addr_cmp(const struct xfrm_tmpl *tmpl, const struct xfrm_state *x)
 {
         return  (tmpl->saddr.a4 &&
                  tmpl->saddr.a4 != x->props.saddr.a4);
 }
 
 static inline int
-__xfrm6_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x)
+__xfrm6_state_addr_cmp(const struct xfrm_tmpl *tmpl, const struct xfrm_state *x)
 {
         return  (!ipv6_addr_any((struct in6_addr*)&tmpl->saddr) &&
                  ipv6_addr_cmp((struct in6_addr *)&tmpl->saddr, (struct in6_addr*)&x->props.saddr));
 }
 
 static inline int
-xfrm_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x, unsigned short family)
+xfrm_state_addr_cmp(const struct xfrm_tmpl *tmpl, const struct xfrm_state *x, unsigned short family)
 {
         switch (family) {
         case AF_INET:
@@ -1126,49 +1165,49 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
 #endif
 
 static __inline__
-xfrm_address_t *xfrm_flowi_daddr(struct flowi *fl, unsigned short family)
+xfrm_address_t *xfrm_flowi_daddr(const struct flowi *fl, unsigned short family)
 {
         switch (family){
         case AF_INET:
-                return (xfrm_address_t *)&fl->fl4_dst;
+                return (xfrm_address_t *)&fl->u.ip4.daddr;
         case AF_INET6:
-                return (xfrm_address_t *)&fl->fl6_dst;
+                return (xfrm_address_t *)&fl->u.ip6.daddr;
         }
         return NULL;
 }
 
 static __inline__
-xfrm_address_t *xfrm_flowi_saddr(struct flowi *fl, unsigned short family)
+xfrm_address_t *xfrm_flowi_saddr(const struct flowi *fl, unsigned short family)
 {
         switch (family){
         case AF_INET:
-                return (xfrm_address_t *)&fl->fl4_src;
+                return (xfrm_address_t *)&fl->u.ip4.saddr;
         case AF_INET6:
-                return (xfrm_address_t *)&fl->fl6_src;
+                return (xfrm_address_t *)&fl->u.ip6.saddr;
         }
         return NULL;
 }
 
 static __inline__
-void xfrm_flowi_addr_get(struct flowi *fl,
+void xfrm_flowi_addr_get(const struct flowi *fl,
                          xfrm_address_t *saddr, xfrm_address_t *daddr,
                          unsigned short family)
 {
         switch(family) {
         case AF_INET:
-                memcpy(&saddr->a4, &fl->fl4_src, sizeof(saddr->a4));
-                memcpy(&daddr->a4, &fl->fl4_dst, sizeof(daddr->a4));
+                memcpy(&saddr->a4, &fl->u.ip4.saddr, sizeof(saddr->a4));
+                memcpy(&daddr->a4, &fl->u.ip4.daddr, sizeof(daddr->a4));
                 break;
         case AF_INET6:
-                ipv6_addr_copy((struct in6_addr *)&saddr->a6, &fl->fl6_src);
-                ipv6_addr_copy((struct in6_addr *)&daddr->a6, &fl->fl6_dst);
+                ipv6_addr_copy((struct in6_addr *)&saddr->a6, &fl->u.ip6.saddr);
+                ipv6_addr_copy((struct in6_addr *)&daddr->a6, &fl->u.ip6.daddr);
                 break;
         }
 }
 
 static __inline__ int
-__xfrm4_state_addr_check(struct xfrm_state *x,
-                         xfrm_address_t *daddr, xfrm_address_t *saddr)
+__xfrm4_state_addr_check(const struct xfrm_state *x,
+                         const xfrm_address_t *daddr, const xfrm_address_t *saddr)
 {
         if (daddr->a4 == x->id.daddr.a4 &&
             (saddr->a4 == x->props.saddr.a4 || !saddr->a4 || !x->props.saddr.a4))
@@ -1177,8 +1216,8 @@ __xfrm4_state_addr_check(struct xfrm_state *x,
 }
 
 static __inline__ int
-__xfrm6_state_addr_check(struct xfrm_state *x,
-                         xfrm_address_t *daddr, xfrm_address_t *saddr)
+__xfrm6_state_addr_check(const struct xfrm_state *x,
+                         const xfrm_address_t *daddr, const xfrm_address_t *saddr)
 {
         if (!ipv6_addr_cmp((struct in6_addr *)daddr, (struct in6_addr *)&x->id.daddr) &&
             (!ipv6_addr_cmp((struct in6_addr *)saddr, (struct in6_addr *)&x->props.saddr)|| 
@@ -1189,8 +1228,8 @@ __xfrm6_state_addr_check(struct xfrm_state *x,
 }
 
 static __inline__ int
-xfrm_state_addr_check(struct xfrm_state *x,
-                      xfrm_address_t *daddr, xfrm_address_t *saddr,
+xfrm_state_addr_check(const struct xfrm_state *x,
+                      const xfrm_address_t *daddr, const xfrm_address_t *saddr,
                       unsigned short family)
 {
         switch (family) {
@@ -1203,23 +1242,23 @@ xfrm_state_addr_check(struct xfrm_state *x,
 }
 
 static __inline__ int
-xfrm_state_addr_flow_check(struct xfrm_state *x, struct flowi *fl,
+xfrm_state_addr_flow_check(const struct xfrm_state *x, const struct flowi *fl,
                            unsigned short family)
 {
         switch (family) {
         case AF_INET:
                 return __xfrm4_state_addr_check(x,
-                                                (xfrm_address_t *)&fl->fl4_dst,
-                                                (xfrm_address_t *)&fl->fl4_src);
+                                                (const xfrm_address_t *)&fl->u.ip4.daddr,
+                                                (const xfrm_address_t *)&fl->u.ip4.saddr);
         case AF_INET6:
                 return __xfrm6_state_addr_check(x,
-                                                (xfrm_address_t *)&fl->fl6_dst,
-                                                (xfrm_address_t *)&fl->fl6_src);
+                                                (const xfrm_address_t *)&fl->u.ip6.daddr,
+                                                (const xfrm_address_t *)&fl->u.ip6.saddr);
         }
         return 0;
 }
 
-static inline int xfrm_state_kern(struct xfrm_state *x)
+static inline int xfrm_state_kern(const struct xfrm_state *x)
 {
         return atomic_read(&x->tunnel_users);
 }
@@ -1323,8 +1362,10 @@ extern int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
                            int (*func)(struct xfrm_state *, int, void*), void *);
 extern void xfrm_state_walk_done(struct xfrm_state_walk *walk);
 extern struct xfrm_state *xfrm_state_alloc(struct net *net);
-extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 
-                                          struct flowi *fl, struct xfrm_tmpl *tmpl,
+extern struct xfrm_state *xfrm_state_find(const xfrm_address_t *daddr,
+                                          const xfrm_address_t *saddr,
+                                          const struct flowi *fl,
+                                          struct xfrm_tmpl *tmpl,
                                           struct xfrm_policy *pol, int *err,
                                           unsigned short family);
 extern struct xfrm_state *xfrm_stateonly_find(struct net *net, u32 mark,
@@ -1337,11 +1378,11 @@ extern void xfrm_state_insert(struct xfrm_state *x);
 extern int xfrm_state_add(struct xfrm_state *x);
 extern int xfrm_state_update(struct xfrm_state *x);
 extern struct xfrm_state *xfrm_state_lookup(struct net *net, u32 mark,
-                                            xfrm_address_t *daddr, __be32 spi,
+                                            const xfrm_address_t *daddr, __be32 spi,
                                             u8 proto, unsigned short family);
 extern struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, u32 mark,
-                                                   xfrm_address_t *daddr,
-                                                   xfrm_address_t *saddr,
+                                                   const xfrm_address_t *daddr,
+                                                   const xfrm_address_t *saddr,
                                                    u8 proto,
                                                    unsigned short family);
 #ifdef CONFIG_XFRM_SUB_POLICY
@@ -1386,10 +1427,8 @@ extern int xfrm_state_delete(struct xfrm_state *x);
 extern int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info);
 extern void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si);
 extern void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si);
-extern int xfrm_replay_check(struct xfrm_state *x,
-                             struct sk_buff *skb, __be32 seq);
-extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);
-extern void xfrm_replay_notify(struct xfrm_state *x, int event);
+extern u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq);
+extern int xfrm_init_replay(struct xfrm_state *x);
 extern int xfrm_state_mtu(struct xfrm_state *x, int mtu);
 extern int xfrm_init_state(struct xfrm_state *x);
 extern int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb);
@@ -1468,19 +1507,19 @@ u32 xfrm_get_acqseq(void);
 extern int xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi);
 struct xfrm_state *xfrm_find_acq(struct net *net, struct xfrm_mark *mark,
                                  u8 mode, u32 reqid, u8 proto,
-                                 xfrm_address_t *daddr,
-                                 xfrm_address_t *saddr, int create,
+                                 const xfrm_address_t *daddr,
+                                 const xfrm_address_t *saddr, int create,
                                  unsigned short family);
 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
 
 #ifdef CONFIG_XFRM_MIGRATE
-extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
-                      struct xfrm_migrate *m, int num_bundles,
-                      struct xfrm_kmaddress *k);
+extern int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
+                      const struct xfrm_migrate *m, int num_bundles,
+                      const struct xfrm_kmaddress *k);
 extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m);
 extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
                                               struct xfrm_migrate *m);
-extern int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
+extern int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
                         struct xfrm_migrate *m, int num_bundles,
                         struct xfrm_kmaddress *k);
 #endif
@@ -1500,10 +1539,10 @@ extern struct xfrm_algo_desc *xfrm_ealg_get_byidx(unsigned int idx);
 extern struct xfrm_algo_desc *xfrm_aalg_get_byid(int alg_id);
 extern struct xfrm_algo_desc *xfrm_ealg_get_byid(int alg_id);
 extern struct xfrm_algo_desc *xfrm_calg_get_byid(int alg_id);
-extern struct xfrm_algo_desc *xfrm_aalg_get_byname(char *name, int probe);
-extern struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe);
-extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe);
-extern struct xfrm_algo_desc *xfrm_aead_get_byname(char *name, int icv_len,
+extern struct xfrm_algo_desc *xfrm_aalg_get_byname(const char *name, int probe);
+extern struct xfrm_algo_desc *xfrm_ealg_get_byname(const char *name, int probe);
+extern struct xfrm_algo_desc *xfrm_calg_get_byname(const char *name, int probe);
+extern struct xfrm_algo_desc *xfrm_aead_get_byname(const char *name, int icv_len,
                                                    int probe);
 
 struct hash_desc;
@@ -1511,7 +1550,8 @@ struct scatterlist;
 typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *,
                               unsigned int);
 
-static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b,
+static inline int xfrm_addr_cmp(const xfrm_address_t *a,
+                                const xfrm_address_t *b,
                                 int family)
 {
         switch (family) {
@@ -1544,16 +1584,21 @@ static inline int xfrm_aevent_is_on(struct net *net)
 }
 #endif
 
-static inline int xfrm_alg_len(struct xfrm_algo *alg)
+static inline int xfrm_alg_len(const 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)
+static inline int xfrm_alg_auth_len(const struct xfrm_algo_auth *alg)
 {
         return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
 }
 
+static inline int xfrm_replay_state_esn_len(struct xfrm_replay_state_esn *replay_esn)
+{
+        return sizeof(*replay_esn) + replay_esn->bmp_len * sizeof(__u32);
+}
+
 #ifdef CONFIG_XFRM_MIGRATE
 static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig)
 {
@@ -1597,7 +1642,7 @@ static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)
         return m->v & m->m;
 }
 
-static inline int xfrm_mark_put(struct sk_buff *skb, struct xfrm_mark *m)
+static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m)
 {
         if (m->m | m->v)
                 NLA_PUT(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m);