diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-10 10:28:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-10 10:28:27 +0100 |
| commit | 6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9 (patch) | |
| tree | f8e52ed2acd6316d0832f084b4c633f1d19079aa /drivers/net/ethernet/ibm/ibmvnic.h | |
| parent | 29b75eb2d56a714190a93d7be4525e617591077a (diff) | |
| parent | 8e0f93cda48ed054e1216bab5c60017e1a5fc1e8 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.h')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h index 1242925ad34c..1a9993cc79b5 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.h +++ b/drivers/net/ethernet/ibm/ibmvnic.h @@ -319,10 +319,8 @@ struct ibmvnic_capability { u8 first; u8 cmd; __be16 capability; /* one of ibmvnic_capabilities */ + __be64 number; struct ibmvnic_rc rc; - __be32 number; /*FIX: should be __be64, but I'm getting the least - * significant word first - */ } __packed __aligned(8); struct ibmvnic_login { |