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

4 files changed, 12 insertions, 13 deletions

diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h
index 004e6f09a6e2..68c896a36a34 100644
--- a/include/linux/if_shaper.h
+++ b/include/linux/if_shaper.h
@@ -23,7 +23,7 @@ struct shaper
         __u32 shapeclock;
         unsigned long recovery; /* Time we can next clock a packet out on
                                    an empty queue */
-        struct semaphore sem;
+        spinlock_t lock;
         struct net_device_stats stats;
         struct net_device *dev;
         int  (*hard_start_xmit) (struct sk_buff *skb,
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 416a2e4024b2..14b950413495 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -183,7 +183,6 @@ struct skb_shared_info {
  *      @priority: Packet queueing priority
  *      @users: User count - see {datagram,tcp}.c
  *      @protocol: Packet protocol from driver
- *      @security: Security level of packet
  *      @truesize: Buffer size 
  *      @head: Head of buffer
  *      @data: Data head pointer
@@ -249,18 +248,18 @@ struct sk_buff {
                                 data_len,
                                 mac_len,
                                 csum;
-        unsigned char           local_df,
-                                cloned:1,
-                                nohdr:1,
-                                pkt_type,
-                                ip_summed;
         __u32                   priority;
-        unsigned short          protocol,
-                                security;
+        __u8                    local_df:1,
+                                cloned:1,
+                                ip_summed:2,
+                                nohdr:1;
+                                /* 3 bits spare */
+        __u8                    pkt_type;
+        __u16                   protocol;
 
         void                    (*destructor)(struct sk_buff *skb);
 #ifdef CONFIG_NETFILTER
-        unsigned long           nfmark;
+        unsigned long           nfmark;
         __u32                   nfcache;
         __u32                   nfctinfo;
         struct nf_conntrack     *nfct;
@@ -1211,7 +1210,7 @@ static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
 {
         int hlen = skb_headlen(skb);
 
-        if (offset + len <= hlen)
+        if (hlen - offset >= len)
                 return skb->data + offset;
 
         if (skb_copy_bits(skb, offset, buffer, len) < 0)
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index a6b2cc530af5..bcb762d93123 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -45,7 +45,7 @@ enum
         TCF_META_ID_REALDEV,
         TCF_META_ID_PRIORITY,
         TCF_META_ID_PROTOCOL,
-        TCF_META_ID_SECURITY,
+        TCF_META_ID_SECURITY, /* obsolete */
         TCF_META_ID_PKTTYPE,
         TCF_META_ID_PKTLEN,
         TCF_META_ID_DATALEN,
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index dfd93d03f5d2..e4fd82e42104 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -286,7 +286,7 @@ struct tcp_sock {
         __u32   max_window;     /* Maximal window ever seen from peer   */
         __u32   pmtu_cookie;    /* Last pmtu seen by socket             */
         __u32   mss_cache;      /* Cached effective mss, not including SACKS */
-        __u16   mss_cache_std;  /* Like mss_cache, but without TSO */
+        __u16   xmit_size_goal; /* Goal for segmenting output packets   */
         __u16   ext_header_len; /* Network protocol overhead (IP/IPv6 options) */
         __u8    ca_state;       /* State of fast-retransmit machine     */
         __u8    retransmits;    /* Number of unrecovered RTO timeouts.  */