diff options
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_cmds.c')
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_cmds.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index dc278391a391..fb140faeafb1 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c | |||
@@ -1849,15 +1849,11 @@ int be_cmd_modify_eqd(struct be_adapter *adapter, struct be_set_eqd *set_eqd, | |||
1849 | { | 1849 | { |
1850 | int num_eqs, i = 0; | 1850 | int num_eqs, i = 0; |
1851 | 1851 | ||
1852 | if (lancer_chip(adapter) && num > 8) { | 1852 | while (num) { |
1853 | while (num) { | 1853 | num_eqs = min(num, 8); |
1854 | num_eqs = min(num, 8); | 1854 | __be_cmd_modify_eqd(adapter, &set_eqd[i], num_eqs); |
1855 | __be_cmd_modify_eqd(adapter, &set_eqd[i], num_eqs); | 1855 | i += num_eqs; |
1856 | i += num_eqs; | 1856 | num -= num_eqs; |
1857 | num -= num_eqs; | ||
1858 | } | ||
1859 | } else { | ||
1860 | __be_cmd_modify_eqd(adapter, set_eqd, num); | ||
1861 | } | 1857 | } |
1862 | 1858 | ||
1863 | return 0; | 1859 | return 0; |
@@ -1865,7 +1861,7 @@ int be_cmd_modify_eqd(struct be_adapter *adapter, struct be_set_eqd *set_eqd, | |||
1865 | 1861 | ||
1866 | /* Uses sycnhronous mcc */ | 1862 | /* Uses sycnhronous mcc */ |
1867 | int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array, | 1863 | int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array, |
1868 | u32 num) | 1864 | u32 num, u32 domain) |
1869 | { | 1865 | { |
1870 | struct be_mcc_wrb *wrb; | 1866 | struct be_mcc_wrb *wrb; |
1871 | struct be_cmd_req_vlan_config *req; | 1867 | struct be_cmd_req_vlan_config *req; |
@@ -1883,6 +1879,7 @@ int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array, | |||
1883 | be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON, | 1879 | be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON, |
1884 | OPCODE_COMMON_NTWK_VLAN_CONFIG, sizeof(*req), | 1880 | OPCODE_COMMON_NTWK_VLAN_CONFIG, sizeof(*req), |
1885 | wrb, NULL); | 1881 | wrb, NULL); |
1882 | req->hdr.domain = domain; | ||
1886 | 1883 | ||
1887 | req->interface_id = if_id; | 1884 | req->interface_id = if_id; |
1888 | req->untagged = BE_IF_FLAGS_UNTAGGED & be_if_cap_flags(adapter) ? 1 : 0; | 1885 | req->untagged = BE_IF_FLAGS_UNTAGGED & be_if_cap_flags(adapter) ? 1 : 0; |