diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-11 14:26:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-11 14:26:58 -0400 |
| commit | 3c709f8fb43e07a0403bba4a8ca7ba00ab874994 (patch) | |
| tree | 9efc1e2bf6930851f0224f525b6cde0f5297fa61 /drivers/net/benet/be_cmds.c | |
| parent | 0074820978004cc484b132d7a9ce0df414660d9d (diff) | |
| parent | 9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6
Conflicts:
drivers/net/benet/be_main.c
Diffstat (limited to 'drivers/net/benet/be_cmds.c')
| -rw-r--r-- | drivers/net/benet/be_cmds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 0fc06d36380..5fedc27c883 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c @@ -133,7 +133,7 @@ static void be_async_grp5_pvid_state_process(struct be_adapter *adapter, struct be_async_event_grp5_pvid_state *evt) { if (evt->enabled) - adapter->pvid = evt->tag; + adapter->pvid = le16_to_cpu(evt->tag); else adapter->pvid = 0; } |