edd: add default mode CONFIG_EDD_OFF=n, override with edd={on,off}

[pandora-kernel.git] / include / linux / inet_lro.h

diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h
index e1fc1d1..80335b7 100644 (file)
--- a/include/linux/inet_lro.h
+++ b/include/linux/inet_lro.h
@@ -52,14 +52,14 @@ struct net_lro_desc {
        struct tcphdr *tcph;
        struct vlan_group *vgrp;
        __wsum  data_csum;
-       u32 tcp_rcv_tsecr;
-       u32 tcp_rcv_tsval;
-       u32 tcp_ack;
+       __be32 tcp_rcv_tsecr;
+       __be32 tcp_rcv_tsval;
+       __be32 tcp_ack;
        u32 tcp_next_seq;
        u32 skb_tot_frags_len;
        u16 ip_tot_len;
        u16 tcp_saw_tstamp;             /* timestamps enabled */
-       u16 tcp_window;
+       __be16 tcp_window;
        u16 vlan_tag;
        int pkt_aggr_cnt;               /* counts aggregated packets */
        int vlan_packet;
@@ -91,6 +91,9 @@ struct net_lro_mgr {
        int max_desc; /* Max number of LRO descriptors  */
        int max_aggr; /* Max number of LRO packets to be aggregated */
 
+       int frag_align_pad; /* Padding required to properly align layer 3
+                            * headers in generated skb when using frags */
+
        struct net_lro_desc *lro_arr; /* Array of LRO descriptors */
 
        /*