aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Rose <gregory.v.rose@intel.com>2011-06-08 03:32:38 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-06-21 04:15:34 -0400
commitf416dfc0e07120d2610e836609b7235897796c90 (patch)
tree874ba30e7815c93f77a348322744f6d349a22f6d
parentac52caa31e0a135a8940a66de763751760820f37 (diff)
ixgbevf: Fix bungled declaration of ixgbevf_mbx_ops
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>
-rw-r--r--drivers/net/ixgbevf/ixgbevf.h2
-rw-r--r--drivers/net/ixgbevf/ixgbevf_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ixgbevf/ixgbevf.h
index b703f60be3b7..a2bbbb358161 100644
--- a/drivers/net/ixgbevf/ixgbevf.h
+++ b/drivers/net/ixgbevf/ixgbevf.h
@@ -279,7 +279,7 @@ enum ixgbevf_boards {
279 279
280extern struct ixgbevf_info ixgbevf_82599_vf_info; 280extern struct ixgbevf_info ixgbevf_82599_vf_info;
281extern struct ixgbevf_info ixgbevf_X540_vf_info; 281extern struct ixgbevf_info ixgbevf_X540_vf_info;
282extern struct ixgbe_mac_operations ixgbevf_mbx_ops; 282extern struct ixgbe_mbx_operations ixgbevf_mbx_ops;
283 283
284/* needed by ethtool.c */ 284/* needed by ethtool.c */
285extern char ixgbevf_driver_name[]; 285extern char ixgbevf_driver_name[];
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index b2c5ecda7977..721417eb0556 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -3364,7 +3364,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
3364 hw->mac.type = ii->mac; 3364 hw->mac.type = ii->mac;
3365 3365
3366 memcpy(&hw->mbx.ops, &ixgbevf_mbx_ops, 3366 memcpy(&hw->mbx.ops, &ixgbevf_mbx_ops,
3367 sizeof(struct ixgbe_mac_operations)); 3367 sizeof(struct ixgbe_mbx_operations));
3368 3368
3369 adapter->flags &= ~IXGBE_FLAG_RX_PS_CAPABLE; 3369 adapter->flags &= ~IXGBE_FLAG_RX_PS_CAPABLE;
3370 adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED; 3370 adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;