diff --git a/[refs] b/[refs] index 26a485ba5c2a..0d75ade3f32e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a881ae1f625c599b460cc8f8a7fcb1c438f699ad +refs/heads/master: a7bf58040f4e8a7245cb3e24ab93057be3c46363 diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h index 52bd03b38962..637fa71de0c7 100644 --- a/trunk/include/linux/if_vlan.h +++ b/trunk/include/linux/if_vlan.h @@ -44,7 +44,7 @@ struct vlan_hdr { * struct vlan_ethhdr - vlan ethernet header (ethhdr + vlan_hdr) * @h_dest: destination ethernet address * @h_source: source ethernet address - * @h_vlan_proto: ethernet protocol (always 0x8100) + * @h_vlan_proto: ethernet protocol * @h_vlan_TCI: priority and VLAN ID * @h_vlan_encapsulated_proto: packet type ID or len */