Merge branch 'sfc-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Apr 2015 16:21:36 +0000 (12:21 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Apr 2015 16:21:36 +0000 (12:21 -0400)
commit8ae178fb1ce0428d1a22c36c8493bda4807ad3b8
tree1737bf6dab3e63e03ae20e0f7b81b3d105b4c6a1
parentb5de97bc1753fb9c5be103a820ea5473923ca067
parent25672dba9535b804331145379c79f835ba2205c5
Merge branch 'sfc-next'

Shradha Shah says:

====================
sfc: Nic specific sriov functions, netdev_ops and sriov_configure

First two patches among the series of patches to support SRIOV on EF10.

First patch declares nic specific sriov functions in nic specific headers,
creates only one instance of the netdev_ops, removes sriov functionality
from Falcon code.

Second patch adds support for sriov_configure.

The Virtual Functions can be enabled but they do not bind to the SFC
driver just yet.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>