aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc/llc_sap.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-05-10 17:14:35 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-05-15 20:14:35 -0400
commit211ed865108e24697b44bee5daac502ee6bdd4a4 (patch)
tree2a902c914f96298f265ef52cba5e463c5c8dea32 /net/llc/llc_sap.c
parentatm: remove the coupling to token ring support (diff)
downloadlinux-dev-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.xz
linux-dev-211ed865108e24697b44bee5daac502ee6bdd4a4.zip
net: delete all instances of special processing for token ring
We are going to delete the Token ring support. This removes any special processing in the core networking for token ring, (aside from net/tr.c itself), leaving the drivers and remaining tokenring support present but inert. The mass removal of the drivers and net/tr.c will be in a separate commit, so that the history of these files that we still care about won't have the giant deletion tied into their history. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/llc/llc_sap.c')
-rw-r--r--net/llc/llc_sap.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 94e7fca75b85..7c5073badc73 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -31,10 +31,6 @@ static int llc_mac_header_len(unsigned short devtype)
case ARPHRD_ETHER:
case ARPHRD_LOOPBACK:
return sizeof(struct ethhdr);
-#if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
- case ARPHRD_IEEE802_TR:
- return sizeof(struct trh_hdr);
-#endif
}
return 0;
}