diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-09-26 15:29:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-09-26 15:29:31 -0700 |
| commit | 56e9b263242ca80a70abd8831343b268315c27dc (patch) | |
| tree | 19a4fe82be6725754a1b0a25638e693d994ac86d /net/802/tr.c | |
| parent | 188bab3ae0ed164bc18f98be932512d777dd038b (diff) | |
| parent | 8420e1b541fe92aee1d8d4d25d9e33eaca756a7b (diff) | |
| download | kernel_samsung_smdk4412-56e9b263242ca80a70abd8831343b268315c27dc.zip kernel_samsung_smdk4412-56e9b263242ca80a70abd8831343b268315c27dc.tar.gz kernel_samsung_smdk4412-56e9b263242ca80a70abd8831343b268315c27dc.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/llc-2.6
Diffstat (limited to 'net/802/tr.c')
| -rw-r--r-- | net/802/tr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index 1bb7dc1..1eaa3d1 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -238,7 +238,7 @@ unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev) return trllc->ethertype; } - return ntohs(ETH_P_802_2); + return ntohs(ETH_P_TR_802_2); } /* |