diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-19 20:16:42 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-19 20:16:42 (GMT) |
| commit | 92352df1dbc5fa2dacfa3b16d57b4641d26be880 (patch) | |
| tree | 0078d9ad099b27e4f15efe0ca3ec3dfa9b817f5b /net/core | |
| parent | 42bbcb780307d85e6585971242f32bd4f6401c99 (diff) | |
| parent | c63762782076765433b602b215ee394af54d1066 (diff) | |
| download | linux-fsl-qoriq-92352df1dbc5fa2dacfa3b16d57b4641d26be880.tar.xz | |
Merge branch 'qlcnic'
Rajesh Borundia says:
====================
* "qlcnic: Change 82xx adapter VLAN id endian type".
- Adapter requires VLAN id in little endian. VLAN id was being
converted to __le16 and then passed as a parameter. Pass VLAN id
as u16 and then use cpu_to_le16 at appropriate places. It is
appropriate for net-next as SR-IOV patches have a dependency on it.
* "qlcnic: Fix loopback test for SR-IOV PF".
- It is appropriate for net-next as change is needed for SRIOV PF
only.
* Remaining patches add enhancements to SR-IOV functionality like
- FLR handling
- Adapter reset recovery handling
- iproute2 tool support for configuring MAC address, Tx rate and
VLAN id.
- Mailbox polling support for SR-IOV PF in case mailbox interrupts
are disabled.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions