Commit 6df3d9e2 authored by David S. Miller's avatar David S. Miller

Merge branch 'ibmvnic-updates-and-fixes'

Nathan Fontenot says:

====================
ibmvnic: Additional updates and bug fixes

This set of patches is an additional set of updates and bug fixes to
the ibmvnic driver which applies on top of the previous set of updates
sent out on 4/19.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6a32a44d 7f5b0308
This diff is collapsed.
...@@ -733,6 +733,7 @@ enum ibmvnic_capabilities { ...@@ -733,6 +733,7 @@ enum ibmvnic_capabilities {
REQ_MTU = 21, REQ_MTU = 21,
MAX_MULTICAST_FILTERS = 22, MAX_MULTICAST_FILTERS = 22,
VLAN_HEADER_INSERTION = 23, VLAN_HEADER_INSERTION = 23,
RX_VLAN_HEADER_INSERTION = 24,
MAX_TX_SG_ENTRIES = 25, MAX_TX_SG_ENTRIES = 25,
RX_SG_SUPPORTED = 26, RX_SG_SUPPORTED = 26,
RX_SG_REQUESTED = 27, RX_SG_REQUESTED = 27,
...@@ -963,6 +964,7 @@ struct ibmvnic_adapter { ...@@ -963,6 +964,7 @@ struct ibmvnic_adapter {
struct ibmvnic_tx_pool *tx_pool; struct ibmvnic_tx_pool *tx_pool;
bool closing; bool closing;
struct completion init_done; struct completion init_done;
int init_done_rc;
struct list_head errors; struct list_head errors;
spinlock_t error_list_lock; spinlock_t error_list_lock;
...@@ -993,6 +995,7 @@ struct ibmvnic_adapter { ...@@ -993,6 +995,7 @@ struct ibmvnic_adapter {
u64 req_mtu; u64 req_mtu;
u64 max_multicast_filters; u64 max_multicast_filters;
u64 vlan_header_insertion; u64 vlan_header_insertion;
u64 rx_vlan_header_insertion;
u64 max_tx_sg_entries; u64 max_tx_sg_entries;
u64 rx_sg_supported; u64 rx_sg_supported;
u64 rx_sg_requested; u64 rx_sg_requested;
......
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