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

Simple overlapping changes in stmmac driver.

Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 16 deletions

diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index 4f40a90ca016..3a512936eea9 100644
--- a/net/strparser/strparser.c
+++ b/net/strparser/strparser.c
@@ -35,7 +35,6 @@ struct _strp_msg {
          */
         struct strp_msg strp;
         int accum_len;
-        int early_eaten;
 };
 
 static inline struct _strp_msg *_strp_msg(struct sk_buff *skb)
@@ -115,20 +114,6 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,
         head = strp->skb_head;
         if (head) {
                 /* Message already in progress */
-
-                stm = _strp_msg(head);
-                if (unlikely(stm->early_eaten)) {
-                        /* Already some number of bytes on the receive sock
-                         * data saved in skb_head, just indicate they
-                         * are consumed.
-                         */
-                        eaten = orig_len <= stm->early_eaten ?
-                                orig_len : stm->early_eaten;
-                        stm->early_eaten -= eaten;
-
-                        return eaten;
-                }
-
                 if (unlikely(orig_offset)) {
                         /* Getting data with a non-zero offset when a message is
                          * in progress is not expected. If it does happen, we
@@ -301,9 +286,9 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,
                                 }
 
                                 stm->accum_len += cand_len;
+                                eaten += cand_len;
                                 strp->need_bytes = stm->strp.full_len -
                                                        stm->accum_len;
-                                stm->early_eaten = cand_len;
                                 STRP_STATS_ADD(strp->stats.bytes, cand_len);
                                 desc->count = 0; /* Stop reading socket */
                                 break;