OSDN Git Service

ixgbevf: Fix bungled declaration of ixgbevf_mbx_ops
authorGreg Rose <gregory.v.rose@intel.com>
Wed, 8 Jun 2011 07:32:38 +0000 (07:32 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 21 Jun 2011 08:15:34 +0000 (01:15 -0700)
In two places storage for mbx_ops is misidentified as type
ixgbe_mac_operations.

Reported-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ixgbevf/ixgbevf.h
drivers/net/ixgbevf/ixgbevf_main.c

index b703f60..a2bbbb3 100644 (file)
@@ -279,7 +279,7 @@ enum ixgbevf_boards {
 
 extern struct ixgbevf_info ixgbevf_82599_vf_info;
 extern struct ixgbevf_info ixgbevf_X540_vf_info;
-extern struct ixgbe_mac_operations ixgbevf_mbx_ops;
+extern struct ixgbe_mbx_operations ixgbevf_mbx_ops;
 
 /* needed by ethtool.c */
 extern char ixgbevf_driver_name[];
index b2c5ecd..721417e 100644 (file)
@@ -3364,7 +3364,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
        hw->mac.type  = ii->mac;
 
        memcpy(&hw->mbx.ops, &ixgbevf_mbx_ops,
-              sizeof(struct ixgbe_mac_operations));
+              sizeof(struct ixgbe_mbx_operations));
 
        adapter->flags &= ~IXGBE_FLAG_RX_PS_CAPABLE;
        adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;