Message ID | 20190827163832.8362-1-jeffrey.t.kirsher@intel.com |
---|---|
Headers | show |
Series | 100GbE Intel Wired LAN Driver Updates 2019-08-26 | expand |
On Tue, 27 Aug 2019 09:38:17 -0700, Jeff Kirsher wrote:
> This series contains updates to ice driver only.
Looks clear from uAPI perspective. It does mix fixes with -next,
but I guess that's your call.
Code-wise changes like this are perhaps the low-light:
@@ -2105,7 +2108,10 @@ void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector)
* @ring: Tx ring to be stopped
* @txq_meta: Meta data of Tx ring to be stopped
*/
-static int
+#ifndef CONFIG_PCI_IOV
+static
+#endif /* !CONFIG_PCI_IOV */
+int
ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
u16 rel_vmvf_num, struct ice_ring *ring,
struct ice_txq_meta *txq_meta)
On Tue, 2019-08-27 at 21:09 -0700, Jakub Kicinski wrote: > On Tue, 27 Aug 2019 09:38:17 -0700, Jeff Kirsher wrote: > > This series contains updates to ice driver only. > > Looks clear from uAPI perspective. It does mix fixes with -next, > but I guess that's your call. Yeah, I always debate about sending the fixes to net, but many of them do not apply cleanly or at all to the previous kernel version since we are actively adding new features and functionality to this driver. Once this device gets released, I will be more concerned about getting fixes into older kernels. > > Code-wise changes like this are perhaps the low-light: > > @@ -2105,7 +2108,10 @@ void ice_trigger_sw_intr(struct ice_hw *hw, struct > ice_q_vector *q_vector) > * @ring: Tx ring to be stopped > * @txq_meta: Meta data of Tx ring to be stopped > */ > -static int > +#ifndef CONFIG_PCI_IOV > +static > +#endif /* !CONFIG_PCI_IOV */ > +int > ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, > u16 rel_vmvf_num, struct ice_ring *ring, > struct ice_txq_meta *txq_meta)
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Tue, 27 Aug 2019 09:38:17 -0700 > This series contains updates to ice driver only. Pulled, but I have to agree with Jakub that using CPP ifdefs to control the "static"'ness of a function is pushing the boundaries of good taste at best.