mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
llc: use dev_hard_header
Using dev_hard_header allows us to use LLC with VLANs and potentially other Ethernet/TokernRing specific encapsulations. It also removes code duplication between LLC and Ethernet/TokenRing core code. Signed-off-by: Octavian Purdila <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
f83d664eef
commit
bf9ae5386b
4 changed files with 17 additions and 47 deletions
|
|
@ -263,11 +263,10 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
|
|||
vhdr->h_vlan_TCI = htons(vlan_tci);
|
||||
|
||||
/*
|
||||
* Set the protocol type. For a packet of type ETH_P_802_3 we
|
||||
* put the length in here instead. It is up to the 802.2
|
||||
* layer to carry protocol information.
|
||||
* Set the protocol type. For a packet of type ETH_P_802_3/2 we
|
||||
* put the length in here instead.
|
||||
*/
|
||||
if (type != ETH_P_802_3)
|
||||
if (type != ETH_P_802_3 && type != ETH_P_802_2)
|
||||
vhdr->h_vlan_encapsulated_proto = htons(type);
|
||||
else
|
||||
vhdr->h_vlan_encapsulated_proto = htons(len);
|
||||
|
|
|
|||
Loading…
Reference in a new issue