diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-16 05:02:40 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-16 05:02:40 (GMT) |
| commit | c727e7f0071cae66c029f667d48b154c6b64227b (patch) | |
| tree | 197c2760fcae529d04d56f56e9cd55f51d6d9273 /net/llc/af_llc.c | |
| parent | 91df42bedccb919902c7cf7eb876c982ae7f1b1d (diff) | |
| parent | ee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d (diff) | |
| download | linux-fsl-qoriq-c727e7f0071cae66c029f667d48b154c6b64227b.tar.xz | |
Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/llc/af_llc.c')
| -rw-r--r-- | net/llc/af_llc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 78424f4..e944075 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); } /** |