From 893314a22f0d8d5a2ba98ac60cdc33c0bde9d6af Mon Sep 17 00:00:00 2001
From: Aastha Mehta <aasthakm@mpi-sws.org>
Date: Fri, 2 Mar 2018 10:54:33 +0100
Subject: [PATCH] pass irq number in rx interception function
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c | 6 +++---
drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h | 2 +-
drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c | 4 ++--
drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 49db6fb0d..7782bdb0a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1620,7 +1620,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
#ifdef CONFIG_XEN_SME
rx_intercept:
xsl_intercept_rx_path((void *) bp->dev, fp->index, fp->rx_bd_prod,
- fp->rx_bd_cons, fp->rx_comp_prod, fp->rx_comp_cons, NULL);
+ fp->rx_bd_cons, fp->rx_comp_prod, fp->rx_comp_cons, irq, NULL);
#endif
#ifdef BNX2X_STOP_ON_ERROR
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c
index 5bd6daef6..c36748ca1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c
@@ -129,17 +129,17 @@ sme_print_sk_buff(struct sk_buff *skb, char *extra_dbg_string)
void
(*lnk_intercept_rx_path) (void *dev, int fp_idx, uint16_t rx_bd_prod,
- uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons,
+ uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons, int irq,
char *extra_dbg_string) = 0;
EXPORT_SYMBOL(lnk_intercept_rx_path);
static void
sme_intercept_rx_path(void *dev, int fp_idx, uint16_t rx_bd_prod,
- uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons,
+ uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons, int irq,
char *extra_dbg_string)
{
if (lnk_intercept_rx_path) {
lnk_intercept_rx_path(dev, fp_idx, rx_bd_prod, rx_bd_cons,
- comp_prod, comp_cons, extra_dbg_string);
+ comp_prod, comp_cons, irq, extra_dbg_string);
}
}
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h
index e3d86b9fc..7191e2106 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h
@@ -41,7 +41,7 @@ union sme_list_options {
char *data, int data_len, char *extra_dbg_string);
void (*print_sk_buff) (struct sk_buff *skb, char *extra_dbg_string);
void (*intercept_rx_path) (void *dev, int fp_idx, uint16_t rx_bd_prod,
- uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons,
+ uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons, int irq,
char *extra_dbg_string);
void (*print_rx_data) (void *dev, int fp_idx, uint16_t rx_bd_prod,
uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c
index 19c5c6c20..22fb5aab6 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c
@@ -111,11 +111,11 @@ void xsl_print_sk_buff(struct sk_buff *skb, char *extra_dbg_string)
EXPORT_SYMBOL(xsl_print_sk_buff);
void xsl_intercept_rx_path(void *dev, int fp_idx, uint16_t rx_bd_prod,
- uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons,
+ uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons, int irq,
char *extra_dbg_string)
{
return call_sme_void_hook(intercept_rx_path, dev, fp_idx, rx_bd_prod,
- rx_bd_cons, comp_prod, comp_cons, extra_dbg_string);
+ rx_bd_cons, comp_prod, comp_cons, irq, extra_dbg_string);
}
EXPORT_SYMBOL(xsl_intercept_rx_path);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h
index 6fe65e0b2..d35fbc3c7 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h
@@ -34,7 +34,7 @@ void xsl_parse_rx_data(void *dev, int fp_idx, uint16_t rx_bd_prod,
int data_len, char *extra_dbg_string);
void xsl_print_sk_buff(struct sk_buff *skb, char *extra_dbg_string);
void xsl_intercept_rx_path(void *dev, int fp_idx, uint16_t rx_bd_prod,
- uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons,
+ uint16_t rx_bd_cons, uint16_t comp_prod, uint16_t comp_cons, int irq,
char *extra_dbg_string);
void xsl_print_rx_data(void *dev, int fp_idx, uint16_t rx_bd_prod,
uint16_t rx_bd_cons, uint16_t rx_comp_prod, uint16_t rx_comp_cons,
--
GitLab