diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 21:33:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 21:33:26 -0400 |
| commit | 5c1f4cac6ff75a4a602bae960a054ed3df7e9765 (patch) | |
| tree | 31b0b05a41345e9dbf802a309ddf21eb506e8550 /net/802/tr.c | |
| parent | c6a519d2aac024d8ca5658bddd78af474b274e4b (diff) | |
| parent | 56e9b263242ca80a70abd8831343b268315c27dc (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-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 1bb7dc1b85cd..1eaa3d19d8bf 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) | |||
| 238 | return trllc->ethertype; | 238 | return trllc->ethertype; |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | return ntohs(ETH_P_802_2); | 241 | return ntohs(ETH_P_TR_802_2); |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | /* | 244 | /* |