Revert "[sfe] Initial PPPoE support for SFE"
This reverts commit 7acf71445aa774a84fa88cf0a3ee09d84e834070.
Change-Id: Id7024e330b61c882bbee8b3192ded49a681841fa
diff --git a/shortcut-fe/sfe_cm.c b/shortcut-fe/sfe_cm.c
index 4866b2e..5f6c33b 100644
--- a/shortcut-fe/sfe_cm.c
+++ b/shortcut-fe/sfe_cm.c
@@ -18,7 +18,6 @@
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_zones.h>
#include <net/netfilter/nf_conntrack_core.h>
-#include <linux/if_pppox.h>
#include "sfe.h"
#include "sfe_ipv4.h"
@@ -77,13 +76,6 @@
dev = skb->dev;
- /*
- * And PPPoE packets
- */
- if (htons(ETH_P_PPP_SES) == skb->protocol) {
- return sfe_pppoe_recv(dev, skb);
- }
-
#if (SFE_HOOK_ABOVE_BRIDGE)
/*
* Does our input device support IP processing?
@@ -111,7 +103,7 @@
return sfe_ipv4_recv(dev, skb);
}
- DEBUG_TRACE("not IP packet or PPPoE packet\n");
+ DEBUG_TRACE("not IP packet\n");
return 0;
}
@@ -441,17 +433,6 @@
sic.src_mtu = 1500;
sic.dest_mtu = 1500;
- if (last_pppox_sock->pppoe_dev == in->name) {
- struct sock *sk = &last_pppox_sock->sk;
-
- if (sk->sk_family == PF_PPPOX && sk->sk_protocol == PX_PROTO_OE) {
- sic.dest_pppoe_sk = sk;
- }
- } else {
- sic.dest_pppoe_sk = NULL;
- }
- sic.src_pppoe_sk = NULL;
-
sfe_ipv4_create_rule(&sic);
/*