Message ID | CAE2NFgVpZoBrNTFV8J3uybuowDj=84nTwgRkta9B0OqGRg-ZDQ@mail.gmail.com |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
>-----Original Message----- >From: Patrick McLean [mailto:patrickm@gaikai.com] >Sent: Friday, July 08, 2016 9:45 AM >To: zhuyj <zyjzyj2000@gmail.com> >Cc: Tantilov, Emil S <emil.s.tantilov@intel.com>; Rustad, Mark D ><mark.d.rustad@intel.com>; netdev <netdev@vger.kernel.org>; intel-wired-lan ><intel-wired-lan@lists.osuosl.org> >Subject: Re: [Intel-wired-lan] [PATCH] (resend) ixgbe: always initialize >setup_fc > >How about just initializing it when the rest of the struct is >initialized? This is what is done for every other model. That works as well. Thanks, Emil
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c index 19b75cd..cfc814a 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c @@ -2915,7 +2915,7 @@ static const struct ixgbe_mac_operations mac_ops_X550EM_x = { .acquire_swfw_sync = &ixgbe_acquire_swfw_sync_X550em, .release_swfw_sync = &ixgbe_release_swfw_sync_X550em, .init_swfw_sync = &ixgbe_init_swfw_sync_X540, - .setup_fc = NULL, /* defined later */ + .setup_fc = ixgbe_setup_fc_x550em, .read_iosf_sb_reg = ixgbe_read_iosf_sb_reg_x550, .write_iosf_sb_reg = ixgbe_write_iosf_sb_reg_x550, };