6 files changed, 72 insertions, 53 deletions

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index df05f468fa5c..9a92aef8b0b2 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -803,9 +803,9 @@ enum ieee80211_state {
 #define IEEE80211_24GHZ_MAX_CHANNEL 14
 #define IEEE80211_24GHZ_CHANNELS    14
 
-#define IEEE80211_52GHZ_MIN_CHANNEL 36
+#define IEEE80211_52GHZ_MIN_CHANNEL 34
 #define IEEE80211_52GHZ_MAX_CHANNEL 165
-#define IEEE80211_52GHZ_CHANNELS    32
+#define IEEE80211_52GHZ_CHANNELS    131
 
 enum {
         IEEE80211_CH_PASSIVE_ONLY = (1 << 0),
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 67856eb93b43..dac43b15a5b0 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -88,12 +88,6 @@ extern struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX];
 extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
 extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
 
-static inline struct nf_conntrack_l3proto *
-__nf_ct_l3proto_find(u_int16_t l3proto)
-{
-        return nf_ct_l3protos[l3proto];
-}
-
 extern struct nf_conntrack_l3proto *
 nf_ct_l3proto_find_get(u_int16_t l3proto);
 
@@ -103,4 +97,13 @@ extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
 extern struct nf_conntrack_l3proto nf_conntrack_generic_l3proto;
+
+static inline struct nf_conntrack_l3proto *
+__nf_ct_l3proto_find(u_int16_t l3proto)
+{
+        if (unlikely(l3proto >= AF_MAX))
+                return &nf_conntrack_generic_l3proto;
+        return nf_ct_l3protos[l3proto];
+}
+
 #endif /*_NF_CONNTRACK_L3PROTO_H*/
diff --git a/include/net/route.h b/include/net/route.h
index e3e5436f8017..9c04f15090d2 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -170,8 +170,8 @@ static inline int ip_route_connect(struct rtable **rp, u32 dst,
         return ip_route_output_flow(rp, &fl, sk, 0);
 }
 
-static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport,
-                                    struct sock *sk)
+static inline int ip_route_newports(struct rtable **rp, u8 protocol,
+                                    u16 sport, u16 dport, struct sock *sk)
 {
         if (sport != (*rp)->fl.fl_ip_sport ||
             dport != (*rp)->fl.fl_ip_dport) {
@@ -180,6 +180,7 @@ static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport,
                 memcpy(&fl, &(*rp)->fl, sizeof(fl));
                 fl.fl_ip_sport = sport;
                 fl.fl_ip_dport = dport;
+                fl.proto = protocol;
                 ip_rt_put(*rp);
                 *rp = NULL;
                 return ip_route_output_flow(rp, &fl, sk, 0);
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index a553f39f6aee..e673b2c984e9 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -175,6 +175,8 @@ void sctp_icmp_frag_needed(struct sock *, struct sctp_association *,
 void sctp_icmp_proto_unreachable(struct sock *sk,
                                  struct sctp_association *asoc,
                                  struct sctp_transport *t);
+void sctp_backlog_migrate(struct sctp_association *assoc,
+                          struct sock *oldsk, struct sock *newsk);
 
 /*
  *  Section:  Macros, externs, and inlines
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index f5c22d77feab..072f407848a6 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -127,9 +127,9 @@ extern struct sctp_globals {
          * RTO.Alpha                - 1/8  (3 when converted to right shifts.)
          * RTO.Beta                 - 1/4  (2 when converted to right shifts.)
          */
-        __u32 rto_initial;
-        __u32 rto_min;
-        __u32 rto_max;
+        unsigned long rto_initial;
+        unsigned long rto_min;
+        unsigned long rto_max;
 
         /* Note: rto_alpha and rto_beta are really defined as inverse
          * powers of two to facilitate integer operations.
@@ -140,12 +140,18 @@ extern struct sctp_globals {
         /* Max.Burst                - 4 */
         int max_burst;
 
-        /* Valid.Cookie.Life        - 60  seconds  */
-        int valid_cookie_life;
-
         /* Whether Cookie Preservative is enabled(1) or not(0) */
         int cookie_preserve_enable;
 
+        /* Valid.Cookie.Life        - 60  seconds  */
+        unsigned long valid_cookie_life;
+
+        /* Delayed SACK timeout  200ms default*/
+        unsigned long sack_timeout;
+
+        /* HB.interval              - 30 seconds  */
+        unsigned long hb_interval;
+
         /* Association.Max.Retrans  - 10 attempts
          * Path.Max.Retrans         - 5  attempts (per destination address)
          * Max.Init.Retransmits     - 8  attempts
@@ -168,12 +174,6 @@ extern struct sctp_globals {
          */
         int rcvbuf_policy;
 
-        /* Delayed SACK timeout  200ms default*/
-        int sack_timeout;
-
-        /* HB.interval              - 30 seconds  */
-        int hb_interval;
-
         /* The following variables are implementation specific.  */
 
         /* Default initialization values to be applied to new associations. */
@@ -405,8 +405,9 @@ struct sctp_cookie {
 /* The format of our cookie that we send to our peer. */
 struct sctp_signed_cookie {
         __u8 signature[SCTP_SECRET_SIZE];
+        __u32 __pad;            /* force sctp_cookie alignment to 64 bits */
         struct sctp_cookie c;
-};
+} __attribute__((packed));
 
 /* This is another convenience type to allocate memory for address
  * params for the maximum size and pass such structures around
@@ -699,7 +700,7 @@ struct sctp_chunk {
         __u8 ecn_ce_done;       /* Have we processed the ECN CE bit? */
         __u8 pdiscard;          /* Discard the whole packet now? */
         __u8 tsn_gap_acked;     /* Is this chunk acked by a GAP ACK? */
-        __u8 fast_retransmit;    /* Is this chunk fast retransmitted? */
+        __s8 fast_retransmit;    /* Is this chunk fast retransmitted? */
         __u8 tsn_missing_report; /* Data chunk missing counter. */
 };
 
@@ -827,7 +828,7 @@ struct sctp_transport {
         __u32 rtt;              /* This is the most recent RTT.  */
 
         /* RTO         : The current retransmission timeout value.  */
-        __u32 rto;
+        unsigned long rto;
 
         /* RTTVAR      : The current RTT variation.  */
         __u32 rttvar;
@@ -877,22 +878,10 @@ struct sctp_transport {
         /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
          * the destination address every heartbeat interval.
          */
-        __u32 hbinterval;
-
-        /* This is the max_retrans value for the transport and will
-         * be initialized from the assocs value.  This can be changed
-         * using SCTP_SET_PEER_ADDR_PARAMS socket option.
-         */
-        __u16 pathmaxrxt;
-
-        /* PMTU       : The current known path MTU.  */
-        __u32 pathmtu;
+        unsigned long hbinterval;
 
         /* SACK delay timeout */
-        __u32 sackdelay;
-
-        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
-        __u32 param_flags;
+        unsigned long sackdelay;
 
         /* When was the last time (in jiffies) that we heard from this
          * transport?  We use this to pick new active and retran paths.
@@ -904,6 +893,18 @@ struct sctp_transport {
          */
         unsigned long last_time_ecne_reduced;
 
+        /* This is the max_retrans value for the transport and will
+         * be initialized from the assocs value.  This can be changed
+         * using SCTP_SET_PEER_ADDR_PARAMS socket option.
+         */
+        __u16 pathmaxrxt;
+
+        /* PMTU       : The current known path MTU.  */
+        __u32 pathmtu;
+
+        /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
+        __u32 param_flags;
+
         /* The number of times INIT has been sent on this transport. */
         int init_sent_count;
 
@@ -1249,6 +1250,14 @@ struct sctp_endpoint {
         int last_key;
         int key_changed_at;
 
+        /* digest:  This is a digest of the sctp cookie.  This field is
+         *          only used on the receive path when we try to validate
+         *          that the cookie has not been tampered with.  We put
+         *          this here so we pre-allocate this once and can re-use
+         *          on every receive.
+         */
+        __u8 digest[SCTP_SIGNATURE_SIZE];
+ 
         /* sendbuf acct. policy.        */
         __u32 sndbuf_policy;
 
@@ -1499,9 +1508,9 @@ struct sctp_association {
          * These values will be initialized by system defaults, but can
          * be modified via the SCTP_RTOINFO socket option.
          */
-        __u32 rto_initial;
-        __u32 rto_max;
-        __u32 rto_min;
+        unsigned long rto_initial;
+        unsigned long rto_max;
+        unsigned long rto_min;
 
         /* Maximum number of new data packets that can be sent in a burst.  */
         int max_burst;
@@ -1519,13 +1528,13 @@ struct sctp_association {
         __u16 init_retries;
 
         /* The largest timeout or RTO value to use in attempting an INIT */
-        __u16 max_init_timeo;
+        unsigned long max_init_timeo;
 
         /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
          * the destination address every heartbeat interval. This value
          * will be inherited by all new transports.
          */
-        __u32 hbinterval;
+        unsigned long hbinterval;
 
         /* This is the max_retrans value for new transports in the
          * association.
@@ -1537,13 +1546,14 @@ struct sctp_association {
          */
         __u32 pathmtu;
 
-        /* SACK delay timeout */
-        __u32 sackdelay;
-
         /* Flags controling Heartbeat, SACK delay, and Path MTU Discovery. */
         __u32 param_flags;
 
-        int timeouts[SCTP_NUM_TIMEOUT_TYPES];
+        /* SACK delay timeout */
+        unsigned long sackdelay;
+
+
+        unsigned long timeouts[SCTP_NUM_TIMEOUT_TYPES];
         struct timer_list timers[SCTP_NUM_TIMEOUT_TYPES];
 
         /* Transport to which SHUTDOWN chunk was last sent.  */
@@ -1648,7 +1658,10 @@ struct sctp_association {
         /* How many duplicated TSNs have we seen?  */
         int numduptsns;
 
-        /* Number of seconds of idle time before an association is closed.  */
+        /* Number of seconds of idle time before an association is closed.
+         * In the association context, this is really used as a boolean
+         * since the real timeout is stored in the timeouts array
+         */
         __u32 autoclose;
 
         /* These are to support
diff --git a/include/net/sock.h b/include/net/sock.h
index 1806e5b61419..30758035d616 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1354,12 +1354,12 @@ extern int sock_get_timestamp(struct sock *, struct timeval __user *);
  *      Enable debug/info messages 
  */
 
-#if 0
-#define NETDEBUG(fmt, args...)  do { } while (0)
-#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
-#else
+#ifdef CONFIG_NETDEBUG
 #define NETDEBUG(fmt, args...)  printk(fmt,##args)
 #define LIMIT_NETDEBUG(fmt, args...) do { if (net_ratelimit()) printk(fmt,##args); } while(0)
+#else
+#define NETDEBUG(fmt, args...)  do { } while (0)
+#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
 #endif
 
 /*