From 7f40b865fd445e0e7c0b6ee103dc7dbc33b69e12 Mon Sep 17 00:00:00 2001
From: Aastha Mehta <aasthakm@mpi-sws.org>
Date: Tue, 4 Sep 2018 19:59:28 +0000
Subject: [PATCH] remove deprecated interception
---
drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c | 15 ---------------
drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h | 5 +----
.../ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c | 9 ---------
.../ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h | 2 --
include/net/tcp.h | 5 -----
5 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c
index 376abd0fa..f98fd0401 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.c
@@ -34,20 +34,6 @@ sme_update_cwnd(struct sk_buff *skb, struct sock *sk,
}
}
-void
-(*lnk_adjust_packet_counts) (struct sock *sk, int ack_seqno, int ack_seqack,
- int acks_delivered, int *dummy_delivered, int update, int reset) = 0;
-EXPORT_SYMBOL(lnk_adjust_packet_counts);
-static void
-sme_adjust_packet_counts(struct sock *sk, int ack_seqno, int ack_seqack,
- int acks_delivered, int *dummy_delivered, int update, int reset)
-{
- if (lnk_adjust_packet_counts) {
- lnk_adjust_packet_counts(sk, ack_seqno, ack_seqack, acks_delivered,
- dummy_delivered, update, reset);
- }
-}
-
int
(*lnk_small_queue_check) (struct sk_buff *skb, struct sock *sk,
unsigned int factor, char *extra_dbg_string) = 0;
@@ -230,7 +216,6 @@ sme_print_xenvif_queue(struct xenvif_queue *queue, char *extra_dbg_string)
struct sme_hook_list xen_sme_hooks[NUM_XEN_SME_HOOKS] = {
SME_HOOK_INIT(update_cwnd, sme_update_cwnd),
- SME_HOOK_INIT(adjust_packet_counts, sme_adjust_packet_counts),
SME_HOOK_INIT(small_queue_check, sme_small_queue_check),
SME_HOOK_INIT(intercept_select_queue, sme_intercept_select_queue),
SME_HOOK_INIT(intercept_tx_sent_queue, sme_intercept_tx_sent_queue),
diff --git a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h
index e0a176dcb..63beb1fb8 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme.h
@@ -30,8 +30,6 @@ union sme_list_options {
int before_cwnd, int before_tp_in_flight,
int after_cwnd, int after_tp_in_flight,
int delivered, int dummy_delivered, char *extra_dbg_string);
- void (*adjust_packet_counts) (struct sock *sk, int ack_seqno, int ack_seqack,
- int acks_delivered, int *dummy_delivered, int update, int reset);
int (*small_queue_check) (struct sk_buff *skb, struct sock *sk,
unsigned int factor, char *extra_dbg_string);
int (*intercept_select_queue) (struct net_device *dev, struct sk_buff *skb,
@@ -59,7 +57,6 @@ union sme_list_options {
struct sme_hook_heads {
struct list_head update_cwnd;
- struct list_head adjust_packet_counts;
struct list_head small_queue_check;
struct list_head intercept_select_queue;
struct list_head intercept_tx_sent_queue;
@@ -85,7 +82,7 @@ struct sme_hook_list {
{ .head = &xen_sme_hook_heads.HEAD, .hook = { . HEAD = HOOK } }
// increment this every time a new hook is added
-#define NUM_XEN_SME_HOOKS 14
+#define NUM_XEN_SME_HOOKS 13
extern struct sme_hook_heads xen_sme_hook_heads;
extern struct sme_hook_list xen_sme_hooks[NUM_XEN_SME_HOOKS];
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 1a3995049..d29e3afa1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.c
@@ -36,7 +36,6 @@
struct sme_hook_heads xen_sme_hook_heads = {
.update_cwnd = LIST_HEAD_INIT(xen_sme_hook_heads.update_cwnd),
- .adjust_packet_counts = LIST_HEAD_INIT(xen_sme_hook_heads.adjust_packet_counts),
.small_queue_check = LIST_HEAD_INIT(xen_sme_hook_heads.small_queue_check),
.intercept_select_queue =
LIST_HEAD_INIT(xen_sme_hook_heads.intercept_select_queue),
@@ -67,14 +66,6 @@ void xsl_update_cwnd(struct sk_buff *skb, struct sock *sk,
}
EXPORT_SYMBOL(xsl_update_cwnd);
-void xsl_adjust_packet_counts(struct sock *sk, int ack_seqno, int ack_seqack,
- int acks_delivered, int *dummy_delivered, int update, int reset)
-{
- return call_sme_void_hook(adjust_packet_counts, sk, ack_seqno, ack_seqack,
- acks_delivered, dummy_delivered, update, reset);
-}
-EXPORT_SYMBOL(xsl_adjust_packet_counts);
-
int xsl_small_queue_check(struct sk_buff *skb, struct sock *sk,
unsigned int factor, char *extra_dbg_string)
{
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 b28b73325..18b313bba 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/sme/xen_sme_hooks.h
@@ -22,8 +22,6 @@ void xsl_update_cwnd(struct sk_buff *skb, struct sock *sk,
int before_cwnd, int before_tp_in_flight,
int after_cwnd, int after_tp_in_flight,
int delivered, int dummy_delivered, char *extra_dbg_string);
-void xsl_adjust_packet_counts(struct sock *sk, int ack_seqno, int ack_seqack,
- int acks_delivered, int *dummy_delivered, int update, int reset);
int xsl_small_queue_check(struct sk_buff *skb, struct sock *sk,
unsigned int factor, char *extra_dbg_string);
int xsl_intercept_select_queue(struct net_device *dev, struct sk_buff *skb,
diff --git a/include/net/tcp.h b/include/net/tcp.h
index b90352630..0988276bc 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -46,11 +46,6 @@
#include <linux/seq_file.h>
#include <linux/memcontrol.h>
-#ifdef CONFIG_XEN_SME
-extern void xsl_adjust_packet_counts(struct sock *sk, int ack_seqno, int ack_seqack,
- int acks_delivered, int *dummy_delivered, int update, int reset);
-#endif
-
extern struct inet_hashinfo tcp_hashinfo;
extern struct percpu_counter tcp_orphan_count;
--
GitLab