diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-24 20:01:43 -0500 |
| commit | b1bf78bfb2e4c9ffa03ccdbc60d89a2f7c5fd82c (patch) | |
| tree | fcd93c3f54a72ca6a6ee97f015efebe6d80a3271 /drivers/net/ethernet/ibm/ibmvnic.h | |
| parent | aea0a897af9e44c258e8ab9296fad417f1bc063a (diff) | |
| parent | d146194f31c96f9b260c5a1cf1592d2e7f82a2e2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.h')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h index 18103b811d4d..99c4f8d331ce 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.h +++ b/drivers/net/ethernet/ibm/ibmvnic.h | |||
| @@ -1075,7 +1075,7 @@ struct ibmvnic_adapter { | |||
| 1075 | struct tasklet_struct tasklet; | 1075 | struct tasklet_struct tasklet; |
| 1076 | enum vnic_state state; | 1076 | enum vnic_state state; |
| 1077 | enum ibmvnic_reset_reason reset_reason; | 1077 | enum ibmvnic_reset_reason reset_reason; |
| 1078 | struct mutex reset_lock, rwi_lock; | 1078 | struct mutex rwi_lock; |
| 1079 | struct list_head rwi_list; | 1079 | struct list_head rwi_list; |
| 1080 | struct work_struct ibmvnic_reset; | 1080 | struct work_struct ibmvnic_reset; |
| 1081 | bool resetting; | 1081 | bool resetting; |