From 6831fd022098604e29be84d95619d271316014f8 Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Wed, 8 Jun 2011 07:32:38 +0000 Subject: [PATCH] --- yaml --- r: 255631 b: refs/heads/master c: f416dfc0e07120d2610e836609b7235897796c90 h: refs/heads/master i: 255629: 3adf24aa1c414509388ebe34a3ddd2b87a3123fd 255627: 11af0e454274f3c126a31f35ce48eeed10a4cac9 255623: ed670d1eca27da9f2f4b4fa635776c48508ebb9c 255615: dfa332155cdf8f2c8d114802e6766fce07a49cab v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbevf/ixgbevf.h | 2 +- trunk/drivers/net/ixgbevf/ixgbevf_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0305c5074652..33c46ed80887 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac52caa31e0a135a8940a66de763751760820f37 +refs/heads/master: f416dfc0e07120d2610e836609b7235897796c90 diff --git a/trunk/drivers/net/ixgbevf/ixgbevf.h b/trunk/drivers/net/ixgbevf/ixgbevf.h index b703f60be3b7..a2bbbb358161 100644 --- a/trunk/drivers/net/ixgbevf/ixgbevf.h +++ b/trunk/drivers/net/ixgbevf/ixgbevf.h @@ -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[]; diff --git a/trunk/drivers/net/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ixgbevf/ixgbevf_main.c index b2c5ecda7977..721417eb0556 100644 --- a/trunk/drivers/net/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ixgbevf/ixgbevf_main.c @@ -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;