Commit 644a918d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller

enic: Make dummy rfs functions inline to fix !CONFIG_RFS_ACCEL build

If CONFIG_RFS_ACCEL=n:

drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_open':
drivers/net/ethernet/cisco/enic/enic_main.c:1603:2: error: implicit declaration of function 'enic_rfs_flw_tbl_init' [-Werror=implicit-function-declaration]
drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_stop':
drivers/net/ethernet/cisco/enic/enic_main.c:1630:2: error: implicit declaration of function 'enic_rfs_flw_tbl_free' [-Werror=implicit-function-declaration]

Introduced in commit a145df23 ("enic: Add
Accelerated RFS support").

Dummy functions are provided, but their prototypes are missing, causing the
build failure.  Provide dummy static inline functions instead to fix this.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6eacef7
...@@ -266,14 +266,4 @@ int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, ...@@ -266,14 +266,4 @@ int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
return res; return res;
} }
#else
void enic_rfs_flw_tbl_init(struct enic *enic)
{
}
void enic_rfs_flw_tbl_free(struct enic *enic)
{
}
#endif /* CONFIG_RFS_ACCEL */ #endif /* CONFIG_RFS_ACCEL */
...@@ -14,6 +14,9 @@ void enic_rfs_flw_tbl_init(struct enic *enic); ...@@ -14,6 +14,9 @@ void enic_rfs_flw_tbl_init(struct enic *enic);
void enic_rfs_flw_tbl_free(struct enic *enic); void enic_rfs_flw_tbl_free(struct enic *enic);
int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
u16 rxq_index, u32 flow_id); u16 rxq_index, u32 flow_id);
#else
static inline void enic_rfs_flw_tbl_init(struct enic *enic) {}
static inline void enic_rfs_flw_tbl_free(struct enic *enic) {}
#endif /* CONFIG_RFS_ACCEL */ #endif /* CONFIG_RFS_ACCEL */
#endif /* _ENIC_CLSF_H_ */ #endif /* _ENIC_CLSF_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment