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

[~shefty/rdma-dev.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 2ed0b6cf11c56de2aeb568bc6d1bd6201d4b75ce..ddee79bb8f1583e8dd45a46e25e264da84967104 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1132,7 +1132,7 @@ struct net_device {
        spinlock_t              addr_list_lock;
        struct netdev_hw_addr_list      uc;     /* Unicast mac addresses */
        struct netdev_hw_addr_list      mc;     /* Multicast mac addresses */
        spinlock_t              addr_list_lock;
        struct netdev_hw_addr_list      uc;     /* Unicast mac addresses */
        struct netdev_hw_addr_list      mc;     /* Multicast mac addresses */

-       int                     uc_promisc;
+       bool                    uc_promisc;

        unsigned int            promiscuity;
        unsigned int            allmulti;
 
        unsigned int            promiscuity;
        unsigned int            allmulti;
 


@@ -1679,9 +1679,12 @@ static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
 static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
                                        unsigned int offset)
 {
 static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
                                        unsigned int offset)
 {

+       if (!pskb_may_pull(skb, hlen))
+               return NULL;
+

        NAPI_GRO_CB(skb)->frag0 = NULL;
        NAPI_GRO_CB(skb)->frag0_len = 0;
        NAPI_GRO_CB(skb)->frag0 = NULL;
        NAPI_GRO_CB(skb)->frag0_len = 0;

-       return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
+       return skb->data + offset;

 }
 
 static inline void *skb_gro_mac_header(struct sk_buff *skb)
 }
 
 static inline void *skb_gro_mac_header(struct sk_buff *skb)