Commit 8971d8e5 authored by David S. Miller's avatar David S. Miller

Merge branch 'qed-fixes'

Sudarsana Reddy Kalluru says:

====================
qed: dcbx fix series.

The patch series contains the minor bug fixes for qed dcbx module.
Please consider applying this to 'net' branch.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1fe323aa 1d7406ce
This diff is collapsed.
...@@ -6850,6 +6850,14 @@ struct dcbx_app_priority_entry { ...@@ -6850,6 +6850,14 @@ struct dcbx_app_priority_entry {
#define DCBX_APP_SF_SHIFT 8 #define DCBX_APP_SF_SHIFT 8
#define DCBX_APP_SF_ETHTYPE 0 #define DCBX_APP_SF_ETHTYPE 0
#define DCBX_APP_SF_PORT 1 #define DCBX_APP_SF_PORT 1
#define DCBX_APP_SF_IEEE_MASK 0x0000f000
#define DCBX_APP_SF_IEEE_SHIFT 12
#define DCBX_APP_SF_IEEE_RESERVED 0
#define DCBX_APP_SF_IEEE_ETHTYPE 1
#define DCBX_APP_SF_IEEE_TCP_PORT 2
#define DCBX_APP_SF_IEEE_UDP_PORT 3
#define DCBX_APP_SF_IEEE_TCP_UDP_PORT 4
#define DCBX_APP_PROTOCOL_ID_MASK 0xffff0000 #define DCBX_APP_PROTOCOL_ID_MASK 0xffff0000
#define DCBX_APP_PROTOCOL_ID_SHIFT 16 #define DCBX_APP_PROTOCOL_ID_SHIFT 16
}; };
......
...@@ -70,8 +70,16 @@ struct qed_dbcx_pfc_params { ...@@ -70,8 +70,16 @@ struct qed_dbcx_pfc_params {
u8 max_tc; u8 max_tc;
}; };
enum qed_dcbx_sf_ieee_type {
QED_DCBX_SF_IEEE_ETHTYPE,
QED_DCBX_SF_IEEE_TCP_PORT,
QED_DCBX_SF_IEEE_UDP_PORT,
QED_DCBX_SF_IEEE_TCP_UDP_PORT
};
struct qed_app_entry { struct qed_app_entry {
bool ethtype; bool ethtype;
enum qed_dcbx_sf_ieee_type sf_ieee;
bool enabled; bool enabled;
u8 prio; u8 prio;
u16 proto_id; u16 proto_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment