net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment

[linux-2.6-block.git] / net / core / gro.c

diff --git a/net/core/gro.c b/net/core/gro.c
index e2f84947fb743e91c2671fe47f1122b8918a8a9f..b3b43de1a650274c680fe2001a2b0c24cabce2e6 100644 (file)
--- a/net/core/gro.c
+++ b/net/core/gro.c
@@ -358,8 +358,6 @@ static void gro_list_prepare(const struct list_head *head,
        list_for_each_entry(p, head, list) {
                unsigned long diffs;
 
-               NAPI_GRO_CB(p)->flush = 0;
-
                if (hash != skb_get_hash_raw(p)) {
                        NAPI_GRO_CB(p)->same_flow = 0;
                        continue;
@@ -499,7 +497,6 @@ found_ptype:
                                        sizeof(u32))); /* Avoid slow unaligned acc */
        *(u32 *)&NAPI_GRO_CB(skb)->zeroed = 0;
        NAPI_GRO_CB(skb)->flush = skb_has_frag_list(skb);
-       NAPI_GRO_CB(skb)->is_atomic = 1;
        NAPI_GRO_CB(skb)->count = 1;
        if (unlikely(skb_is_gso(skb))) {
                NAPI_GRO_CB(skb)->count = skb_shinfo(skb)->gso_segs;