From 77ca0b6238cf079d4e689e91d50198cbba32978c Mon Sep 17 00:00:00 2001
From: Aastha Mehta <aasthakm@mpi-sws.org>
Date: Fri, 29 Jun 2018 10:22:59 +0000
Subject: [PATCH] update API to adjust copied_seq
---
drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.c | 6 ++++--
drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.h | 3 ++-
drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.c | 6 +++---
drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.h | 3 ++-
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.c b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.c
index d1a6f2919..358eefc26 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.c
@@ -74,9 +74,11 @@ int ptcp_rx_adjust_skb_size(struct sock *sk, struct sk_buff *skb, int req_len,
}
EXPORT_SYMBOL(ptcp_rx_adjust_skb_size);
-int ptcp_rx_adjust_copied_seq(struct sock *sk, struct sk_buff *skb, int old_skb_len)
+int ptcp_rx_adjust_copied_seq(struct sock *sk, struct sk_buff *skb,
+ int old_skb_len, int new_skb_len)
{
- return call_ptcp_int_hook(rx_adjust_copied_seq, -1, sk, skb, old_skb_len);
+ return call_ptcp_int_hook(rx_adjust_copied_seq, -1, sk, skb, old_skb_len,
+ new_skb_len);
}
EXPORT_SYMBOL(ptcp_rx_adjust_copied_seq);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.h b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.h
index de385c1c8..6bd80fb1e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks.h
@@ -21,7 +21,8 @@ int ptcp_rx_disable_coalesce(struct sock *sk, struct sk_buff *to,
struct sk_buff *from);
int ptcp_rx_adjust_skb_size(struct sock *sk, struct sk_buff *skb, int req_len,
int offset, int chunk, int copied, int flags);
-int ptcp_rx_adjust_copied_seq(struct sock *sk, struct sk_buff *skb, int old_skb_len);
+int ptcp_rx_adjust_copied_seq(struct sock *sk, struct sk_buff *skb,
+ int old_skb_len, int new_skb_len);
int ptcp_tx_adjust_skb_size(struct sock *sk, int size, gfp_t gfp,
bool force_schedule);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.c b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.c
index 06785dc93..574342aa8 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.c
@@ -66,14 +66,14 @@ ptcp_impl_rx_adjust_skb_size(struct sock *sk, struct sk_buff *skb, int req_len,
}
int (*lnk_rx_adjust_copied_seq) (struct sock *sk, struct sk_buff *skb,
- int old_skb_len) = 0;
+ int old_skb_len, int new_skb_len) = 0;
EXPORT_SYMBOL(lnk_rx_adjust_copied_seq);
static int
ptcp_impl_rx_adjust_copied_seq (struct sock *sk, struct sk_buff *skb,
- int old_skb_len)
+ int old_skb_len, int new_skb_len)
{
if (lnk_rx_adjust_copied_seq) {
- return lnk_rx_adjust_copied_seq(sk, skb, old_skb_len);
+ return lnk_rx_adjust_copied_seq(sk, skb, old_skb_len, new_skb_len);
}
return -1;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.h b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.h
index 65d3dde51..a613e1db9 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/ptcp_hooks_impl.h
@@ -30,7 +30,8 @@ union ptcp_list_options {
struct sk_buff *from);
int (*rx_adjust_skb_size) (struct sock *sk, struct sk_buff *skb, int req_len,
int offset, int chunk, int copied, int flags);
- int (*rx_adjust_copied_seq) (struct sock *sk, struct sk_buff *skb, int old_skb_len);
+ int (*rx_adjust_copied_seq) (struct sock *sk, struct sk_buff *skb,
+ int old_skb_len, int new_skb_len);
int (*tx_adjust_skb_size) (struct sock *sk, int size, gfp_t gfp,
bool force_schedule);
int (*tx_adjust_seq) (struct sock *sk, struct sk_buff *skb, int copy, int copied);
--
GitLab