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

[linux-2.6-microblaze.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index eed028a..222b1d3 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5966,7 +5966,7 @@ static void gro_list_prepare(const struct list_head *head,
        }
 }
 
-static void skb_gro_reset_offset(struct sk_buff *skb)
+static inline void skb_gro_reset_offset(struct sk_buff *skb, u32 nhoff)
 {
        const struct skb_shared_info *pinfo = skb_shinfo(skb);
        const skb_frag_t *frag0 = &pinfo->frags[0];
@@ -5977,7 +5977,7 @@ static void skb_gro_reset_offset(struct sk_buff *skb)
 
        if (!skb_headlen(skb) && pinfo->nr_frags &&
            !PageHighMem(skb_frag_page(frag0)) &&
-           (!NET_IP_ALIGN || !(skb_frag_off(frag0) & 3))) {
+           (!NET_IP_ALIGN || !((skb_frag_off(frag0) + nhoff) & 3))) {
                NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
                NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
                                                    skb_frag_size(frag0),
@@ -6195,7 +6195,7 @@ gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
        skb_mark_napi_id(skb, napi);
        trace_napi_gro_receive_entry(skb);
 
-       skb_gro_reset_offset(skb);
+       skb_gro_reset_offset(skb, 0);
 
        ret = napi_skb_finish(napi, skb, dev_gro_receive(napi, skb));
        trace_napi_gro_receive_exit(ret);
@@ -6284,7 +6284,7 @@ static struct sk_buff *napi_frags_skb(struct napi_struct *napi)
        napi->skb = NULL;
 
        skb_reset_mac_header(skb);
-       skb_gro_reset_offset(skb);
+       skb_gro_reset_offset(skb, hlen);
 
        if (unlikely(skb_gro_header_hard(skb, hlen))) {
                eth = skb_gro_header_slow(skb, hlen, 0);