diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 17:14:35 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-15 20:14:35 -0400 |
| commit | 211ed865108e24697b44bee5daac502ee6bdd4a4 (patch) | |
| tree | 2a902c914f96298f265ef52cba5e463c5c8dea32 /net/llc | |
| parent | 60eea6cf2964beea6c38d9050bc3823a93db97e0 (diff) | |
| download | linux-3.10-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.gz linux-3.10-211ed865108e24697b44bee5daac502ee6bdd4a4.tar.bz2 linux-3.10-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')
| -rw-r--r-- | net/llc/af_llc.c | 3 | ||||
| -rw-r--r-- | net/llc/llc_output.c | 3 | ||||
| -rw-r--r-- | net/llc/llc_sap.c | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 78424f41cf3..e9440753e16 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -71,8 +71,7 @@ static inline u16 llc_ui_next_link_no(int sap) */ static inline __be16 llc_proto_type(u16 arphrd) { - return arphrd == ARPHRD_IEEE802_TR ? - htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); + return htons(ETH_P_802_2); } /** diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c index b658cba89fd..2dae8a5df23 100644 --- a/net/llc/llc_output.c +++ b/net/llc/llc_output.c @@ -14,9 +14,7 @@ */ #include <linux/if_arp.h> -#include <linux/if_tr.h> #include <linux/netdevice.h> -#include <linux/trdevice.h> #include <linux/skbuff.h> #include <linux/export.h> #include <net/llc.h> @@ -37,7 +35,6 @@ int llc_mac_hdr_init(struct sk_buff *skb, int rc = -EINVAL; switch (skb->dev->type) { - case ARPHRD_IEEE802_TR: case ARPHRD_ETHER: case ARPHRD_LOOPBACK: rc = dev_hard_header(skb, skb->dev, ETH_P_802_2, da, sa, diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c index 94e7fca75b8..7c5073badc7 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; } |