IB/core: Add VLAN support for IBoE

Add 802.1q VLAN support to IBoE. The VLAN tag is encoded within the
GID derived from a link local address in the following way:

    GID[11] GID[12] contain the VLAN ID when the GID contains a VLAN.

The 3 bits user priority field of the packets are identical to the 3
bits of the SL.

In case of rdma_cm apps, the TOS field is used to generate the SL
field by doing a shift right of 5 bits effectively taking to 3 MS bits
of the TOS field.

Signed-off-by: Eli Cohen <eli@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/include/rdma/ib_pack.h b/include/rdma/ib_pack.h
index 6b91d8e7a1fa..b37fe3b10a9d 100644
--- a/include/rdma/ib_pack.h
+++ b/include/rdma/ib_pack.h
@@ -38,6 +38,7 @@
 enum {
         IB_LRH_BYTES  = 8,
         IB_ETH_BYTES  = 14,
+        IB_VLAN_BYTES = 4,
         IB_GRH_BYTES  = 40,
         IB_BTH_BYTES  = 12,
         IB_DETH_BYTES = 8
@@ -219,11 +220,18 @@ struct ib_unpacked_eth {
         __be16  type;
 };
 
+struct ib_unpacked_vlan {
+        __be16  tag;
+        __be16  type;
+};
+
 struct ib_ud_header {
         int                     lrh_present;
         struct ib_unpacked_lrh  lrh;
         int                     eth_present;
         struct ib_unpacked_eth  eth;
+        int                     vlan_present;
+        struct ib_unpacked_vlan vlan;
         int                     grh_present;
         struct ib_unpacked_grh  grh;
         struct ib_unpacked_bth  bth;
@@ -245,6 +253,7 @@ void ib_unpack(const struct ib_field        *desc,
 void ib_ud_header_init(int                  payload_bytes,
                        int                  lrh_present,
                        int                  eth_present,
+                       int                  vlan_present,
                        int                  grh_present,
                        int                  immediate_present,
                        struct ib_ud_header *header);