diff --git a/[refs] b/[refs] index 59e34b88b164..28034cda3460 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 096f0eb1dff326ddebfedeb128fb48d5b7ca75e1 +refs/heads/master: 0519d8fbabc4eb215a8263f29143ccd86c328157 diff --git a/trunk/net/802/tr.c b/trunk/net/802/tr.c index 1bb7dc1b85cd..1eaa3d19d8bf 100644 --- a/trunk/net/802/tr.c +++ b/trunk/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); } /*