aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/llc_pdu.h
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 /include/net/llc_pdu.h
parent60eea6cf2964beea6c38d9050bc3823a93db97e0 (diff)
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 'include/net/llc_pdu.h')
-rw-r--r--include/net/llc_pdu.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index f57e7d46a453..5a93d13ac95c 100644
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -13,7 +13,6 @@
13 */ 13 */
14 14
15#include <linux/if_ether.h> 15#include <linux/if_ether.h>
16#include <linux/if_tr.h>
17 16
18/* Lengths of frame formats */ 17/* Lengths of frame formats */
19#define LLC_PDU_LEN_I 4 /* header and 2 control bytes */ 18#define LLC_PDU_LEN_I 4 /* header and 2 control bytes */
@@ -253,10 +252,6 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
253{ 252{
254 if (skb->protocol == htons(ETH_P_802_2)) 253 if (skb->protocol == htons(ETH_P_802_2))
255 memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN); 254 memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
256 else if (skb->protocol == htons(ETH_P_TR_802_2)) {
257 memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN);
258 *sa &= 0x7F;
259 }
260} 255}
261 256
262/** 257/**
@@ -270,8 +265,6 @@ static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
270{ 265{
271 if (skb->protocol == htons(ETH_P_802_2)) 266 if (skb->protocol == htons(ETH_P_802_2))
272 memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN); 267 memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
273 else if (skb->protocol == htons(ETH_P_TR_802_2))
274 memcpy(da, tr_hdr(skb)->daddr, ETH_ALEN);
275} 268}
276 269
277/** 270/**