diff options
author | Emil Tantilov <emil.s.tantilov@intel.com> | 2010-07-01 16:05:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-05 21:50:55 -0400 |
commit | 396e799c3ac29f970c40bde87b76f4652c06df76 (patch) | |
tree | c1eb2f147cd6f9610e90711e96e450ba89cb19df /drivers/net/ixgbe/ixgbe_sriov.c | |
parent | 4478a9cdf007a0418755a8a4016af8352fb1c1f3 (diff) |
ixgbe: use netif_<level> instead of netdev_<level>
This patch restores the ability to set msglvl through ethtool.
The issue was introduced by:
commit 849c45423c0c108e08d67644728cc9b0ed225fa1
CC: Joe Perches <joe@perches.com>
Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_sriov.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_sriov.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c index 6e6dee04ff61..49661a138e22 100644 --- a/drivers/net/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ixgbe/ixgbe_sriov.c | |||
@@ -185,7 +185,8 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask) | |||
185 | 185 | ||
186 | if (enable) { | 186 | if (enable) { |
187 | random_ether_addr(vf_mac_addr); | 187 | random_ether_addr(vf_mac_addr); |
188 | e_info("IOV: VF %d is enabled MAC %pM\n", vfn, vf_mac_addr); | 188 | e_info(probe, "IOV: VF %d is enabled MAC %pM\n", |
189 | vfn, vf_mac_addr); | ||
189 | /* | 190 | /* |
190 | * Store away the VF "permananet" MAC address, it will ask | 191 | * Store away the VF "permananet" MAC address, it will ask |
191 | * for it later. | 192 | * for it later. |
@@ -244,7 +245,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) | |||
244 | if (msgbuf[0] == IXGBE_VF_RESET) { | 245 | if (msgbuf[0] == IXGBE_VF_RESET) { |
245 | unsigned char *vf_mac = adapter->vfinfo[vf].vf_mac_addresses; | 246 | unsigned char *vf_mac = adapter->vfinfo[vf].vf_mac_addresses; |
246 | u8 *addr = (u8 *)(&msgbuf[1]); | 247 | u8 *addr = (u8 *)(&msgbuf[1]); |
247 | e_info("VF Reset msg received from vf %d\n", vf); | 248 | e_info(probe, "VF Reset msg received from vf %d\n", vf); |
248 | adapter->vfinfo[vf].clear_to_send = false; | 249 | adapter->vfinfo[vf].clear_to_send = false; |
249 | ixgbe_vf_reset_msg(adapter, vf); | 250 | ixgbe_vf_reset_msg(adapter, vf); |
250 | adapter->vfinfo[vf].clear_to_send = true; | 251 | adapter->vfinfo[vf].clear_to_send = true; |
@@ -297,7 +298,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) | |||
297 | retval = ixgbe_set_vf_vlan(adapter, add, vid, vf); | 298 | retval = ixgbe_set_vf_vlan(adapter, add, vid, vf); |
298 | break; | 299 | break; |
299 | default: | 300 | default: |
300 | e_err("Unhandled Msg %8.8x\n", msgbuf[0]); | 301 | e_err(drv, "Unhandled Msg %8.8x\n", msgbuf[0]); |
301 | retval = IXGBE_ERR_MBX; | 302 | retval = IXGBE_ERR_MBX; |
302 | break; | 303 | break; |
303 | } | 304 | } |